Change default comparison method to none to avoid confusing errors wh…

…en multiple procs are defined in a test. #1415 PiperOrigin-RevId: 669318695
google · Aug 30, 2024 · 63a36e5 · 63a36e5
1 parent 6d4f276
commit 63a36e5
Show file tree

Hide file tree

Showing 18 changed files with 69 additions and 1 deletion.
diff --git a/third_party/xls_berkeley_softfloat/BUILD b/third_party/xls_berkeley_softfloat/BUILD
@@ -41,6 +41,7 @@ xls_dslx_opt_ir(
 # udiv not supported in equivalence checking.
 xls_dslx_test(
     name = "fpdiv_2x32_dslx_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":fpdiv_2x32_dslx",
     tags = ["optonly"],
 )

diff --git a/third_party/xls_colors/BUILD b/third_party/xls_colors/BUILD
@@ -26,6 +26,7 @@ exports_files(["LICENSE"])
 xls_dslx_test(
     name = "hsv2rgb_dslx_test",
     srcs = ["hsv2rgb.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 cc_test(

diff --git a/third_party/xls_go_math/BUILD b/third_party/xls_go_math/BUILD
@@ -43,6 +43,7 @@ xls_dslx_opt_ir(
 
 xls_dslx_test(
     name = "fpexp_32_dslx_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":fpexp_32_dslx",
 )
 
@@ -114,6 +115,7 @@ xls_dslx_opt_ir(
 
 xls_dslx_test(
     name = "fp_sincos_32_dslx_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":fp_sincos_32_dslx",
 )
 
@@ -179,6 +181,7 @@ xls_dslx_opt_ir(
 
 xls_dslx_test(
     name = "fp_trig_reduce_dslx_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":fp_trig_reduce_dslx_module",
 )
 
@@ -244,6 +247,7 @@ xls_dslx_opt_ir(
 
 xls_dslx_test(
     name = "fpsqrt_32_dslx_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":fpsqrt_32_dslx",
 )
 

diff --git a/xls/build_rules/tests/BUILD b/xls/build_rules/tests/BUILD
@@ -207,6 +207,7 @@ sh_test(
 xls_dslx_test(
     name = "generated_file_as_input_test",
     srcs = ["generated.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 # Encapsulate the generated file as a library.
@@ -226,6 +227,7 @@ xls_dslx_library(
 # Reference the library with the generated file inside of a xls_dslx_test rule.
 xls_dslx_test(
     name = "dependent_on_library_with_generated_file_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":importer_dslx",
 )
 
@@ -260,6 +262,7 @@ xls_dslx_library(
 # xls_dslx_test on a xls_dslx_library with a transitive dependency.
 xls_dslx_test(
     name = "d_dslx_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":d_dslx",
 )
 
@@ -276,6 +279,7 @@ xls_dslx_library(
 # xls_dslx_test on a xls_dslx_library with a transitive dependency.
 xls_dslx_test(
     name = "e_dslx_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":e_dslx",
 )
 
@@ -360,6 +364,7 @@ xls_dslx_verilog(
 xls_dslx_test(
     name = "chaining_example_test",
     srcs = ["chaining_example.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_ir(
@@ -564,6 +569,7 @@ xls_dslx_library(
 # Execute the DSLX interpreter.
 xls_dslx_test(
     name = "simple_example_4_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":simple_example_4_dslx",
 )
 

diff --git a/xls/build_rules/xls_dslx_rules.bzl b/xls/build_rules/xls_dslx_rules.bzl
@@ -38,7 +38,7 @@ _H_FILE_EXTENSION = ".h"
 _CC_FILE_EXTENSION = ".cc"
 
 _DEFAULT_DSLX_TEST_ARGS = {
-    "compare": "jit",
+    "compare": "none",
 }
 
 def get_transitive_dslx_srcs_files_depset(srcs, deps):

diff --git a/xls/dslx/stdlib/BUILD b/xls/dslx/stdlib/BUILD
@@ -51,6 +51,7 @@ xls_dslx_fmt_test(
 xls_dslx_test(
     name = "std_dslx_test",
     srcs = ["std.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_prove_quickcheck_test(
@@ -61,6 +62,7 @@ xls_dslx_prove_quickcheck_test(
 xls_dslx_test(
     name = "acm_random_dslx_test",
     srcs = ["acm_random.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_fmt_test(
@@ -77,6 +79,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "apfloat_dslx_test",
     srcs = ["apfloat.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_prove_quickcheck_test(
@@ -110,6 +113,7 @@ xls_dslx_fmt_test(
 xls_dslx_test(
     name = "bfloat16_dslx_test",
     srcs = ["bfloat16.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_opt_ir(
@@ -185,6 +189,7 @@ xls_dslx_fmt_test(
 xls_dslx_test(
     name = "float32_dslx_test",
     srcs = ["float32.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_opt_ir(
@@ -336,6 +341,7 @@ cc_test(
 xls_dslx_test(
     name = "float32_upcast_test",
     srcs = ["float32_upcast_test.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_opt_ir(
@@ -625,6 +631,7 @@ xls_dslx_fmt_test(
 xls_dslx_test(
     name = "float64_dslx_test",
     srcs = ["float64.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_opt_ir(

diff --git a/xls/dslx/tests/trace_fmt_repro_issue_652/BUILD b/xls/dslx/tests/trace_fmt_repro_issue_652/BUILD
@@ -53,5 +53,6 @@ xls_dslx_opt_ir(
 
 xls_dslx_test(
     name = "trace_fmt_repro_dslx_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":trace_fmt_repro_dslx",
 )
diff --git a/xls/examples/BUILD b/xls/examples/BUILD
@@ -74,6 +74,7 @@ xls_dslx_fmt_test(
 xls_dslx_test(
     name = "lfsr_dslx_test",
     srcs = ["lfsr.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_library(
@@ -85,6 +86,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "lfsr_proc_dslx_test",
     srcs = ["lfsr_proc.x"],
+    dslx_test_args = {"compare": "jit"},
     deps = [":lfsr_proc_dslx"],
 )
 
@@ -96,6 +98,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "capitalize_dslx_test",
     srcs = ["capitalize.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_opt_ir(
@@ -155,6 +158,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "dot_product_dslx_test",
     srcs = ["dot_product.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_library(
@@ -165,6 +169,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "fir_filter_dslx_test",
     srcs = ["fir_filter.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_library(
@@ -311,6 +316,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "ffi_test",
     srcs = ["ffi.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_verilog(
@@ -356,6 +362,7 @@ xls_dslx_opt_ir(
 xls_dslx_test(
     name = "sha256_dslx_test",
     srcs = ["sha256.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 # TODO(rspringer): OOMs on some machines. Add xls_ir_equivalence_test.
@@ -394,12 +401,14 @@ xls_dslx_library(
 xls_dslx_test(
     name = "sobel_filter_dslx_test",
     srcs = ["sobel_filter.x"],
+    dslx_test_args = {"compare": "jit"},
     deps = [":sobel_filter_dslx"],
 )
 
 xls_dslx_test(
     name = "sobel_filter_test",
     srcs = ["sobel_filter.x"],
+    dslx_test_args = {"compare": "jit"},
     deps = [":sobel_filter_dslx"],
 )
 
@@ -559,6 +568,7 @@ xls_dslx_library(
 
 xls_dslx_test(
     name = "memory_proc_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":memory_proc_dslx",
 )
 
@@ -571,6 +581,7 @@ xls_dslx_library(
 
 xls_dslx_test(
     name = "tiny_adder_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":tiny_adder_dslx",
 )
 
@@ -605,6 +616,7 @@ xls_dslx_library(
 
 xls_dslx_test(
     name = "find_index_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":find_index_dslx",
 )
 
@@ -671,6 +683,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "large_array_dslx_test",
     srcs = ["large_array.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_opt_ir(
@@ -696,6 +709,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "prefix_sum_dslx_test",
     srcs = ["prefix_sum.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_opt_ir(
@@ -721,6 +735,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "sparse_prefix_sum_dslx_test",
     srcs = ["sparse_prefix_sum.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_opt_ir(
@@ -745,6 +760,7 @@ xls_dslx_library(
 
 xls_dslx_test(
     name = "ram_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":ram_dslx",
 )
 
@@ -756,6 +772,7 @@ xls_dslx_library(
 
 xls_dslx_test(
     name = "delay_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":delay_dslx",
 )
 
@@ -839,6 +856,7 @@ xls_dslx_fmt_test(
 
 xls_dslx_test(
     name = "delay_loopback_channel_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":delay_loopback_channel_dslx",
 )
 
@@ -923,6 +941,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "constraint_dslx_test",
     srcs = ["constraint.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_ir(
@@ -1033,6 +1052,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "overflow_detect_dslx_test",
     srcs = ["overflow_detect.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_opt_ir(
@@ -1051,6 +1071,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "nested_sel_dslx_test",
     srcs = ["nested_sel.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_opt_ir(
@@ -1072,6 +1093,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "cubic_bezier_dslx_test",
     srcs = ["cubic_bezier.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_library(
@@ -1082,6 +1104,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "bitonic_sort_dslx_test",
     srcs = ["bitonic_sort.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_library(
@@ -1092,6 +1115,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "hack_cpu_dslx_test",
     srcs = ["hack_cpu.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_library(
@@ -1101,6 +1125,7 @@ xls_dslx_library(
 
 xls_dslx_test(
     name = "serialized_decomposer_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":serialized_decomposer_dslx",
 )
 
@@ -1178,6 +1203,7 @@ xls_dslx_library(
 xls_dslx_test(
     name = "passthrough_dslx_test",
     srcs = ["passthrough.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_verilog(
@@ -1202,4 +1228,5 @@ xls_dslx_test(
     name = "gcd_test",
     size = "small",
     srcs = ["gcd.x"],
+    dslx_test_args = {"compare": "jit"},
 )
diff --git a/xls/examples/adler32/BUILD b/xls/examples/adler32/BUILD
@@ -42,6 +42,7 @@ xls_dslx_opt_ir(
 xls_dslx_test(
     name = "adler32_dslx_test",
     srcs = ["adler32.x"],
+    dslx_test_args = {"compare": "jit"},
 )
 
 xls_dslx_fmt_test(

diff --git a/xls/examples/apfloat_add_parallel/BUILD b/xls/examples/apfloat_add_parallel/BUILD
@@ -38,6 +38,7 @@ xls_dslx_library(
 
 xls_dslx_test(
     name = "apfloat_add_parallel_dslx_test",
+    dslx_test_args = {"compare": "jit"},
     library = ":apfloat_add_parallel_dslx",
 )