[NFC][wasm-reduce] Create a tools subdirectory

In preparation for refactoring wasm-reduce.cpp into multiple files.

Author: tlively

src/tools/CMakeLists.txt

@@ -17,10 +17,10 @@ binaryen_add_executable(wasm-dis wasm-dis.cpp)
 binaryen_add_executable(wasm-ctor-eval wasm-ctor-eval.cpp)
 if(NOT BUILD_EMSCRIPTEN_TOOLS_ONLY)
   binaryen_add_executable(wasm-shell wasm-shell.cpp)
-  binaryen_add_executable(wasm-reduce wasm-reduce.cpp)
   binaryen_add_executable(wasm-merge wasm-merge.cpp)
   binaryen_add_executable(wasm-fuzz-types "${fuzzing_SOURCES};wasm-fuzz-types.cpp")
   binaryen_add_executable(wasm-fuzz-lattices "${fuzzing_SOURCES};wasm-fuzz-lattices.cpp")
+  add_subdirectory(wasm-reduce)
 endif()
 
 add_subdirectory(wasm-split)

src/tools/wasm-reduce/CMakeLists.txt

@@ -0,0 +1,6 @@
+FILE(GLOB wasm_reduce_HEADERS *h)
+set(wasm_reduce_SOURCES
+  wasm-reduce.cpp
+  ${wasm_reduce_HEADERS}
+)
+binaryen_add_executable(wasm-reduce "${wasm_reduce_SOURCES}")

src/tools/wasm-reduce.cpp renamed to src/tools/wasm-reduce/wasm-reduce.cpp

@@ -39,7 +39,7 @@
 #include "support/hash.h"
 #include "support/path.h"
 #include "support/timing.h"
-#include "tool-options.h"
+#include "tools/tool-options.h"
 #include "wasm-builder.h"
 #include "wasm-io.h"
 #include "wasm-validator.h"
@@ -793,8 +793,7 @@ struct Reducer
     bool shrank = false;
     shrank = shrinkByReduction(curr, 2);
     // the "opposite" of shrinking: copy a 'zero' element
-    reduceByZeroing(
-      curr, 0, [](char item) { return item == 0; }, 2, shrank);
+    reduceByZeroing(curr, 0, [](char item) { return item == 0; }, 2, shrank);
   }
 
   template<typename T, typename U, typename C>