Move IRGraphCXXPrinter to the fuzz folder and fixup compilation, and make the simplify fuzzer print out the Expr.

Author: mcourteaux

Makefile

@@ -529,7 +529,6 @@ SOURCE_FILES = \
   Interval.cpp \
   IR.cpp \
   IREquality.cpp \
-  IRGraphCXXPrinter.cpp \
   IRMatch.cpp \
   IRMutator.cpp \
   IROperator.cpp \
@@ -733,7 +732,6 @@ HEADER_FILES = \
   IntrusivePtr.h \
   IR.h \
   IREquality.h \
-  IRGraphCXXPrinter.h \
   IRMatch.h \
   IRMutator.h \
   IROperator.h \
@@ -1288,7 +1286,7 @@ PERFORMANCE_TESTS = $(shell ls $(ROOT_DIR)/test/performance/*.cpp)
 ERROR_TESTS = $(shell ls $(ROOT_DIR)/test/error/*.cpp)
 WARNING_TESTS = $(shell ls $(ROOT_DIR)/test/warning/*.cpp)
 RUNTIME_TESTS = $(shell ls $(ROOT_DIR)/test/runtime/*.cpp)
-FUZZ_TESTS = $(filter-out %halide_fuzz_main.cpp, $(shell ls $(ROOT_DIR)/test/fuzz/*.cpp))
+FUZZ_TESTS = $(filter-out %halide_fuzz_main.cpp %IRGraphCXXPrinter.cpp, $(shell ls $(ROOT_DIR)/test/fuzz/*.cpp))
 GENERATOR_EXTERNAL_TESTS := $(shell ls $(ROOT_DIR)/test/generator/*test.cpp)
 GENERATOR_EXTERNAL_TEST_GENERATOR := $(shell ls $(ROOT_DIR)/test/generator/*_generator.cpp)
 TUTORIALS = $(filter-out %_generate.cpp, $(shell ls $(ROOT_DIR)/tutorial/*.cpp))
@@ -1477,7 +1475,7 @@ $(BIN_DIR)/$(TARGET)/correctness_opencl_runtime: $(ROOT_DIR)/test/correctness/op
 $(BIN_DIR)/performance_%: $(ROOT_DIR)/test/performance/%.cpp $(TEST_DEPS)
 	$(CXX) $(TEST_CXX_FLAGS) $(OPTIMIZE) $< -I$(INCLUDE_DIR) -I$(ROOT_DIR)/src/runtime -I$(ROOT_DIR)/test/common $(TEST_LD_FLAGS) -o $@
 
-$(BIN_DIR)/fuzz_%: $(ROOT_DIR)/test/fuzz/%.cpp $(ROOT_DIR)/test/fuzz/halide_fuzz_main.cpp $(ROOT_DIR)/test/fuzz/fuzz_helpers.h $(ROOT_DIR)/test/fuzz/halide_fuzz_main.h $(TEST_DEPS)
+$(BIN_DIR)/fuzz_%: $(ROOT_DIR)/test/fuzz/%.cpp $(ROOT_DIR)/test/fuzz/halide_fuzz_main.cpp $(ROOT_DIR)/test/fuzz/fuzz_helpers.h $(ROOT_DIR)/test/fuzz/halide_fuzz_main.h $(ROOT_DIR)/test/fuzz/IRGraphCXXPrinter.cpp $(ROOT_DIR)/test/fuzz/IRGraphCXXPrinter.h $(TEST_DEPS)
 	$(CXX) $(TEST_CXX_FLAGS) -I$(ROOT_DIR)/src/runtime -I$(ROOT_DIR)/test/common $(OPTIMIZE_FOR_BUILD_TIME) $(filter %.cpp,$^) -I$(INCLUDE_DIR) $(TEST_LD_FLAGS) -o $@ -DHALIDE_FUZZER_BACKEND=0
 
 # Error tests that link against libHalide

src/CMakeLists.txt

@@ -139,7 +139,6 @@ target_sources(
     IntrusivePtr.h
     IR.h
     IREquality.h
-    IRGraphCXXPrinter.h
     IRMatch.h
     IRMutator.h
     IROperator.h
@@ -319,7 +318,6 @@ target_sources(
     Interval.cpp
     IR.cpp
     IREquality.cpp
-    IRGraphCXXPrinter.cpp
     IRMatch.cpp
     IRMutator.cpp
     IROperator.cpp

test/fuzz/CMakeLists.txt

@@ -36,20 +36,24 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, std::size_t Size) {
 }
 ]] HAVE_LIBFUZZER_FLAGS)
 
-add_library(Halide_fuzz INTERFACE)
+add_library(Halide_fuzz OBJECT)
 add_library(Halide::fuzz ALIAS Halide_fuzz)
 
+target_sources(Halide_fuzz PRIVATE IRGraphCXXPrinter.cpp)
+target_link_libraries(Halide_fuzz PRIVATE Halide::Test)
+
 if (NOT HAVE_LIBFUZZER_FLAGS)
     if (LIB_FUZZING_ENGINE)
         message(FATAL_ERROR "Cannot set LIB_FUZZING_ENGINE when not building with -fsanitize=fuzzer or a compatible fuzzing engine.")
     endif ()
-    target_sources(Halide_fuzz INTERFACE halide_fuzz_main.cpp halide_fuzz_main.h)
-    target_compile_definitions(Halide_fuzz INTERFACE HALIDE_FUZZER_BACKEND=HALIDE_FUZZER_BACKEND_STDLIB)
+    target_sources(Halide_fuzz PRIVATE halide_fuzz_main.cpp halide_fuzz_main.h)
+    target_compile_definitions(Halide_fuzz PUBLIC HALIDE_FUZZER_BACKEND=HALIDE_FUZZER_BACKEND_STDLIB)
 else ()
-    target_link_libraries(Halide_fuzz INTERFACE ${LIB_FUZZING_ENGINE})
-    target_compile_definitions(Halide_fuzz INTERFACE HALIDE_FUZZER_BACKEND=HALIDE_FUZZER_BACKEND_LIBFUZZER)
+    target_link_libraries(Halide_fuzz PUBLIC ${LIB_FUZZING_ENGINE})
+    target_compile_definitions(Halide_fuzz PUBLIC HALIDE_FUZZER_BACKEND=HALIDE_FUZZER_BACKEND_LIBFUZZER)
 endif ()
 
+
 foreach (fuzzer IN LISTS TEST_NAMES)
     target_link_libraries("${fuzzer}" PRIVATE Halide::fuzz)
 endforeach ()

test/fuzz/IRGraphCXXPrinter.cpp

@@ -1,11 +1,5 @@
 #include "IRGraphCXXPrinter.h"
 
-#include "Expr.h"
-#include "Function.h"
-#include "IR.h"
-#include "IREquality.h"
-#include "IROperator.h"
-
 #include <sstream>
 
 namespace Halide {

test/fuzz/IRGraphCXXPrinter.h

@@ -6,9 +6,7 @@
 #include <string>
 #include <vector>
 
-#include "Expr.h"
-#include "IR.h"
-#include "IRVisitor.h"
+#include <Halide.h>
 
 namespace Halide {
 namespace Internal {

test/fuzz/simplify.cpp

@@ -1,6 +1,7 @@
 #include "Halide.h"
 #include <functional>
 
+#include "IRGraphCXXPrinter.h"
 #include "fuzz_helpers.h"
 #include "random_expr_generator.h"
 
@@ -153,6 +154,13 @@ FUZZ_TEST(simplify, FuzzingContext &fuzz) {
             return e;
         });
         std::cerr << "Final test case: " << test << "\n";
+
+        std::cerr << "\n\nC++ code:\n\n";
+        IRGraphCXXPrinter printer(std::cerr);
+        printer.print(test);
+        std::cerr << "Expr final_expr = " << printer.node_names[test.get()] << ";\n";
+        std::cerr << "\n\n";
+
         return 1;
     }
 

test/internal.cpp

@@ -9,7 +9,6 @@
 #include "Generator.h"
 #include "IR.h"
 #include "IREquality.h"
-#include "IRGraphCXXPrinter.h"
 #include "IRMatch.h"
 #include "IRPrinter.h"
 #include "Interval.h"
@@ -25,7 +24,6 @@ using namespace Halide::Internal;
 
 int main(int argc, const char **argv) {
     IRPrinter::test();
-    IRGraphCXXPrinter::test();
     CodeGen_C::test();
     ir_equality_test();
     bounds_test();