Port internal self-tests out of libHalide into test/correctness

.github/workflows/testing-make.yml

@@ -89,9 +89,6 @@ jobs:
 
       - run: make build_tests
 
-      - run: make test_internal
-        if: ${{ !cancelled() }}
-
       - run: make test_correctness
         if: ${{ !cancelled() }}
 

Makefile

@@ -991,7 +991,7 @@ endif
 endif
 
 .PHONY: all
-all: distrib test_internal
+all: distrib
 
 # Depending on which linker we're using,
 # we need a different invocation to get the
@@ -1388,7 +1388,7 @@ test_generator: $(GENERATOR_AOT_TESTS) $(GENERATOR_AOTCPP_TESTS) $(GENERATOR_JIT
 	$(FILTERS_DIR)/rungen_test
 	$(FILTERS_DIR)/registration_test
 
-ALL_TESTS = test_internal test_correctness test_error test_tutorial test_warning test_runtime test_generator
+ALL_TESTS = test_correctness test_error test_tutorial test_warning test_runtime test_generator
 
 # These targets perform timings of each test. For most tests this includes Halide JIT compile times, and run times.
 # For generator tests they time the compile time only. The times are recorded in CSV files.
@@ -1448,10 +1448,6 @@ $(BIN_DIR)/%/runtime.a: $(BIN_DIR)/runtime.generator
 	@mkdir -p $(@D)
 	$(CURDIR)/$< -r runtime -o $(CURDIR)/$(BIN_DIR)/$* target=$*
 
-$(BIN_DIR)/test_internal: $(ROOT_DIR)/test/internal.cpp $(TEST_DEPS)
-	@mkdir -p $(@D)
-	$(CXX) $(TEST_CXX_FLAGS) $< -I$(SRC_DIR) $(TEST_LD_FLAGS) -o $@
-
 ifneq (,$(shell which flatc))
 $(BUILD_DIR)/Deserialization.o : $(BUILD_DIR)/halide_ir.fbs.h
 $(BUILD_DIR)/Serialization.o : $(BUILD_DIR)/halide_ir.fbs.h
@@ -1481,6 +1477,12 @@ $(BIN_DIR)/correctness_halide_buffer: $(ROOT_DIR)/test/correctness/halide_buffer
 $(BIN_DIR)/correctness_image_io: $(ROOT_DIR)/test/correctness/image_io.cpp $(TEST_DEPS)
 	$(CXX) $(TEST_CXX_FLAGS) $(IMAGE_IO_CXX_FLAGS) -I$(ROOT_DIR)/src/runtime -I$(ROOT_DIR)/test/common $(OPTIMIZE_FOR_BUILD_TIME) $< -I$(INCLUDE_DIR) $(TEST_LD_FLAGS) $(IMAGE_IO_LIBS) -o $@
 
+# The spirv_ir test needs access to the internal-only SpirvIR.h header and
+# the vendored SPIR-V headers used by the Vulkan backend.
+$(BIN_DIR)/correctness_spirv_ir: $(ROOT_DIR)/test/correctness/spirv_ir.cpp $(TEST_DEPS)
+	@mkdir -p $(@D)
+	$(CXX) $(TEST_CXX_FLAGS) -I$(ROOT_DIR)/src/runtime -I$(ROOT_DIR)/test/common $(OPTIMIZE_FOR_BUILD_TIME) $< -I$(INCLUDE_DIR) -I$(SRC_DIR) $(SPIRV_CXX_FLAGS) $(TEST_LD_FLAGS) -o $@
+
 # OpenCL runtime correctness test requires runtime.a to be linked.
 $(BIN_DIR)/$(TARGET)/correctness_opencl_runtime: $(ROOT_DIR)/test/correctness/opencl_runtime.cpp $(RUNTIME_EXPORTED_INCLUDES) $(BIN_DIR)/$(TARGET)/runtime.a
 	@mkdir -p $(@D)
@@ -2071,11 +2073,6 @@ $(BIN_DIR)/tutorial_lesson_21_auto_scheduler_run: $(ROOT_DIR)/tutorial/lesson_21
         -lHalide $(TEST_LD_FLAGS) $(COMMON_LD_FLAGS) $(IMAGE_IO_LIBS) -o $@
 	@-echo
 
-test_internal: $(BIN_DIR)/test_internal
-	@-mkdir -p $(TMP_DIR)
-	cd $(TMP_DIR) ; $(CURDIR)/$<
-	@-echo
-
 correctness_%: $(BIN_DIR)/correctness_%
 	@-mkdir -p $(TMP_DIR)
 	cd $(TMP_DIR) ; $(CURDIR)/$<

src/Associativity.h

@@ -111,8 +111,6 @@ struct AssociativeOp {
 AssociativeOp prove_associativity(
     const std::string &f, std::vector<Expr> args, std::vector<Expr> exprs);
 
-void associativity_test();
-
 }  // namespace Internal
 }  // namespace Halide
 

src/AutoScheduleUtils.cpp

@@ -379,35 +379,5 @@ bool inline_all_element_wise_functions(const vector<Function> &outputs,
     return inlined;
 }
 
-namespace {
-void check(const Expr &input, Expr expected) {
-    Expr result = simplify(substitute_var_estimates(input));
-    expected = simplify(expected);
-    if (!equal(result, expected)) {
-        internal_error
-            << "\nsubstitute_var_estimates() failure:\n"
-            << "Input: " << input << "\n"
-            << "Result: " << result << "\n"
-            << "Expected result: " << expected << "\n";
-    }
-}
-}  // anonymous namespace
-
-void propagate_estimate_test() {
-    Param<int> p;
-    p.set_estimate(10);
-
-    ImageParam img(Int(32), 2);
-    img.dim(0).set_estimate(-3, 33);
-    img.dim(1).set_estimate(5, 55);
-
-    Var x("x"), y("y");
-    check(p + x + y, x + y + 10);
-    check(img.dim(0).min() + img.dim(1).min() + x, x + 2);
-    check(img.dim(0).extent() + img.dim(1).min() + img.dim(1).extent() * x, 55 * x + 38);
-
-    std::cout << "Propagate estimate test passed\n";
-}
-
 }  // namespace Internal
 }  // namespace Halide

src/AutoScheduleUtils.h

@@ -130,8 +130,6 @@ bool inline_all_element_wise_functions(const std::vector<Function> &outputs,
                                        const std::vector<std::string> &order,
                                        const std::map<std::string, Function> &env);
 
-void propagate_estimate_test();
-
 }  // namespace Internal
 }  // namespace Halide