Reorganize bluetcl test procs so you can test BSV and BH syntax output

(together or separately)

Author: nanavati

testsuite/config/bluetcl.tcl

@@ -43,7 +43,7 @@ proc bluetcl_exec { cmdline outname } {
     set output [make_bluetcl_output_name $outname]
     set cmd "$bluetcl $cmdline >& $output"
     verbose "Executing: $cmd" 4
-    set status [exec_with_log "run_bluetcl" $cmd 2]
+    set status [exec_with_log "bluetcl_exec" $cmd 2]
     cd $here
     return [expr $status == 0]
 }
@@ -81,8 +81,17 @@ proc make_bluetcl_bh_output_name { source } {
     return $filename
 }
 
+
+# For historical reasons, we do not tag BSV syntax output with -bsv
+# the way we tag BH syntax output with -bh
+proc make_bluetcl_bsv_output_name { source } {
+
+    return [make_bluetcl_output_name $source]
+
+}
+
 # worker bee
-proc run_bluetcl { source } {
+proc run_bluetcl_bsv { source } {
     global bluetcl
     global srcdir
     global subdir
@@ -91,10 +100,10 @@ proc run_bluetcl { source } {
 
     set here [absolute $srcdir]
     cd [file join $here $subdir]
-    set output [make_bluetcl_output_name $source]
+    set output [make_bluetcl_bsv_output_name $source]
     set cmd "$bluetcl $source >& $output"
     verbose "Executing: $cmd" 4
-    set status [exec_with_log "run_bluetcl" $cmd 2]
+    set status [exec_with_log "run_bluetcl_bsv" $cmd 2]
     cd $here
     return [expr $status == 0]
 }
@@ -118,59 +127,101 @@ proc run_bluetcl_bh { source } {
     return [expr $status == 0]
 }
 
-# Do a bluetcl run, and report status
-proc bluetcl_pass { source } {
+# Do a bluetcl run (BSV syntax) and report status
+proc bluetcl_bsv_pass { source } {
     global xfail_flag
 
     set current_xfail $xfail_flag
 
-    incr_stat "bluetcl_pass"
+    incr_stat "bluetcl_bsv_pass"
 
-    if [run_bluetcl $source] then {
-	pass "`$source' executes"
+    if [run_bluetcl_bsv $source] then {
+	pass "`$source' executes with BSV syntax"
     } else {
-	fail "`$source' should execute"
+	fail "`$source' should execute with BSV syntax"
     }
+}
+
+# Do a bluetcl run (BH syntax) and report status
+proc bluetcl_bh_pass { source } {
+    global xfail_flag
+
+    set current_xfail $xfail_flag
+
+    incr_stat "bluetcl_bh_pass"
 
     if [run_bluetcl_bh $source] then {
-	pass "`$source' executes with Bluespec Haskell syntax"
+	pass "`$source' executes with BH syntax"
     } else {
-	fail "`$source' should execute with Bluespec Haskell syntax"
+	fail "`$source' should execute with BH syntax"
     }
+}
 
+# Do bluetcl runs and report status (both syntaxes)
+proc bluetcl_pass { source } {
+    bluetcl_bsv_pass $source
+    bluetcl_bh_pass $source
 }
 
-# DO run and compare output
-proc bluetcl_run_compare_pass { source {expected ""} {expected_bh ""} {sedfilter ""} } {
+# Do bluetcl run and compare output (BSV syntax)
+proc bluetcl_run_bsv_compare_pass { source {expected ""} {sedfilter ""} } {
+
+    bluetcl_bsv_pass $source
+
+    set output [make_bluetcl_bsv_output_name $source]
 
-    bluetcl_pass $source
+    bluetcl_compare $output $expected $sedfilter
+
+}
+
+# Do bluetcl run and compare output (BH syntax)
+proc bluetcl_run_bh_compare_pass { source {expected ""} {sedfilter ""} } {
+
+    bluetcl_bh_pass $source
 
-    set output [make_bluetcl_output_name $source]
+    set output [make_bluetcl_bh_output_name $source]
 
     bluetcl_compare $output $expected $sedfilter
 
-    set output_bh [make_bluetcl_bh_output_name $source]
+}
+
+# Do bluetcl runs and compare output (both syntaxes)
+proc bluetcl_run_compare_pass { source {expected_bsv ""} {expected_bh ""} {sedfilter ""} } {
+
+    bluetcl_run_bsv_compare_pass $source $expected_bsv $sedfilter
+
+    bluetcl_run_bh_compare_pass $source $expected_bh $sedfilter
 
-    bluetcl_compare $output_bh $expected_bh $sedfilter
 }
 
-# DO run and compare output (does not match because of known bug)
-proc bluetcl_run_compare_pass_bug { source {expected ""} {expected_bh "" } {sedfilter ""} {bug ""} } {
+# Do bluetcl run and compare output (BSV syntax, does not match because of known bug)
+proc bluetcl_run_bsv_compare_pass_bug { source {expected ""} {sedfilter ""} {bug ""} } {
 
     global env
     global target_triplet
 
-    bluetcl_pass $source
+    bluetcl_bsv_pass $source
 
-    set output [make_bluetcl_output_name $source]
+    set output [make_bluetcl_bsv_output_name $source]
 
     setup_xfail $target_triplet $bug
     bluetcl_compare $output $expected $sedfilter
 
-    set output_bh [make_bluetcl_bh_output_name $source]
+}
+
+# Do bluetcl run and compare output (BH syntax, does not match because of known bug)
+proc bluetcl_run_bh_compare_pass_bug { source {expected ""} {sedfilter ""} {bug ""} } {
+
+    global env
+    global target_triplet
+
+    bluetcl_bh_pass $source
+
+    set output [make_bluetcl_bh_output_name $source]
 
     setup_xfail $target_triplet $bug
-    bluetcl_compare $output_bh $expected_bh $sedfilter
+    bluetcl_compare $output $expected $sedfilter
+
 }
 
 # RUN bluetcl with options specifying outfile (can be a module rather than tclfile