Revert "Use wasm32/wasm64 for webgpu"

This reverts commit 38f9ab6.
halide · Jul 25, 2024 · a2064e4 · a2064e4
1 parent 55c3610
commit a2064e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -1071,9 +1071,6 @@ RUNTIME_TRIPLE_WIN_ARM_64 = "aarch64-unknown-windows-unknown"
 # TODO: was le64 here, not sure if this is correct or not
 RUNTIME_TRIPLE_WIN_GENERIC_64 = "x86_64-unknown-windows-unknown"
 
-RUNTIME_TRIPLE_WEBGPU_32 = "wasm32-unknown-unknown-unknown"
-RUNTIME_TRIPLE_WEBGPU_64 = "wasm64-unknown-unknown-unknown"
-
 # `-fno-threadsafe-statics` is very important here (note that it allows us to use a 'modern' C++
 # standard but still skip threadsafe guards for static initialization in our runtime code)
 #
@@ -1124,22 +1121,6 @@ $(BUILD_DIR)/initmod.windows_%_64.ll: $(SRC_DIR)/runtime/windows_%.cpp $(BUILD_D
 	@mkdir -p $(@D)
 	$(CLANG) $(CXX_WARNING_FLAGS) $(RUNTIME_CXX_FLAGS) -m64 -target $(RUNTIME_TRIPLE_WIN_GENERIC_64) -fshort-wchar -DCOMPILING_HALIDE_RUNTIME -DBITS_64 -emit-llvm -S $(SRC_DIR)/runtime/windows_$*.cpp -o $@ -MMD -MP -MF $(BUILD_DIR)/initmod.windows_$*_64.d
 
-$(BUILD_DIR)/initmod.webgpu_%_32.ll: $(SRC_DIR)/runtime/webgpu_%.cpp $(BUILD_DIR)/clang_ok
-    @mkdir -p $(@D)
-    $(CLANG) $(CXX_WARNING_FLAGS) $(RUNTIME_CXX_FLAGS) -m32 -target $(RUNTIME_TRIPLE_WEBGPU_32) -DCOMPILING_HALIDE_RUNTIME -DBITS_32 -emit-llvm -S $(SRC_DIR)/runtime/webgpu_$*.cpp -o $@ -MMD -MP -MF $(BUILD_DIR)/initmod.webgpu_$*_32.d
-
-$(BUILD_DIR)/initmod.webgpu_%_64.ll: $(SRC_DIR)/runtime/webgpu_%.cpp $(BUILD_DIR)/clang_ok
-    @mkdir -p $(@D)
-    $(CLANG) $(CXX_WARNING_FLAGS) $(RUNTIME_CXX_FLAGS) -m64 -target $(RUNTIME_TRIPLE_WEBGPU_64) -DCOMPILING_HALIDE_RUNTIME -DBITS_64 -emit-llvm -S $(SRC_DIR)/runtime/webgpu_$*.cpp -o $@ -MMD -MP -MF $(BUILD_DIR)/initmod.webgpu_$*_64.d
-
-$(BUILD_DIR)/initmod.webgpu_%_32_debug.ll: $(SRC_DIR)/runtime/webgpu_%.cpp $(BUILD_DIR)/clang_ok
-    @mkdir -p $(@D)
-    $(CLANG) $(CXX_WARNING_FLAGS) -g -DDEBUG_RUNTIME $(RUNTIME_CXX_FLAGS) -m32 -target $(RUNTIME_TRIPLE_WEBGPU_32) -DCOMPILING_HALIDE_RUNTIME -DBITS_32 -emit-llvm -S $(SRC_DIR)/runtime/webgpu_$*.cpp -o $@ -MMD -MP -MF $(BUILD_DIR)/initmod.webgpu_$*_32_debug.d
-
-$(BUILD_DIR)/initmod.webgpu_%_64_debug.ll: $(SRC_DIR)/runtime/webgpu_%.cpp $(BUILD_DIR)/clang_ok
-    @mkdir -p $(@D)
-    $(CLANG) $(CXX_WARNING_FLAGS) -g -DDEBUG_RUNTIME $(RUNTIME_CXX_FLAGS) -m64 -target $(RUNTIME_TRIPLE_WEBGPU_64) -DCOMPILING_HALIDE_RUNTIME -DBITS_64 -emit-llvm -S $(SRC_DIR)/runtime/webgpu_$*.cpp -o $@ -MMD -MP -MF $(BUILD_DIR)/initmod.webgpu_$*_64_debug.d
-
 $(BUILD_DIR)/initmod.%_64.ll: $(SRC_DIR)/runtime/%.cpp $(BUILD_DIR)/clang_ok
 	@mkdir -p $(@D)
 	$(CLANG) $(CXX_WARNING_FLAGS) $(RUNTIME_CXX_FLAGS) -fpic -m64 -target $(RUNTIME_TRIPLE_64) -DCOMPILING_HALIDE_RUNTIME -DBITS_64 -emit-llvm -S $(SRC_DIR)/runtime/$*.cpp -o $@ -MMD -MP -MF $(BUILD_DIR)/initmod.$*_64.d

diff --git a/src/runtime/CMakeLists.txt b/src/runtime/CMakeLists.txt
@@ -222,20 +222,14 @@ foreach (i IN LISTS RUNTIME_CPP)
                     set(TARGET "x86_64-unknown-windows-unknown")
                 endif ()
             endif()
-        elseif (i MATCHES "webgpu")
-            if (j EQUAL 32)
-                # wasm32 will fail for some i386 builds, but i386 won't
-                set(TARGET "wasm32-unknown-unknown-unknown")
-            else ()
-                set(TARGET "wasm64-unknown-unknown-unknown")
-            endif ()
+        # Everything else
         else()
             # don't be fooled: these are just generic 32/64-bit targets for our purposes here
             if (j EQUAL 32)
                 # wasm32 will fail for some i386 builds, but i386 won't
                 set(TARGET "i386-unknown-unknown-unknown")
             else ()
-                set(TARGET "x86_64-unknown-unknown-unknown")
+                set(TARGET "wasm64-unknown-unknown-unknown")
             endif ()
         endif ()