Permit the debug instructions in WebGPU SPIR-V - remove from the optimizer (#3083)
continuing #3063
fixing #3052
diff --git a/source/opt/optimizer.cpp b/source/opt/optimizer.cpp
index d1b2417..241aa75 100644
--- a/source/opt/optimizer.cpp
+++ b/source/opt/optimizer.cpp
@@ -230,8 +230,7 @@
}
Optimizer& Optimizer::RegisterVulkanToWebGPUPasses() {
- return RegisterPass(CreateStripDebugInfoPass())
- .RegisterPass(CreateStripAtomicCounterMemoryPass())
+ return RegisterPass(CreateStripAtomicCounterMemoryPass())
.RegisterPass(CreateGenerateWebGPUInitializersPass())
.RegisterPass(CreateLegalizeVectorShufflePass())
.RegisterPass(CreateSplitInvalidUnreachablePass())
diff --git a/test/opt/optimizer_test.cpp b/test/opt/optimizer_test.cpp
index 5c0707d..945aa78 100644
--- a/test/opt/optimizer_test.cpp
+++ b/test/opt/optimizer_test.cpp
@@ -234,7 +234,6 @@
"eliminate-dead-code-aggressive",
"eliminate-dead-const",
"flatten-decorations",
- "strip-debug",
"strip-atomic-counter-memory",
"generate-webgpu-initializers",
"legalize-vector-shuffle",
@@ -330,35 +329,6 @@
"OpFunctionEnd\n",
// pass
"flatten-decorations"},
- // Strip Debug
- {// input
- "OpCapability Shader\n"
- "OpCapability VulkanMemoryModel\n"
- "OpExtension \"SPV_KHR_vulkan_memory_model\"\n"
- "OpMemoryModel Logical Vulkan\n"
- "OpEntryPoint Vertex %func \"shader\"\n"
- "OpName %main \"main\"\n"
- "OpName %void_fn \"void_fn\"\n"
- "%void = OpTypeVoid\n"
- "%void_f = OpTypeFunction %void\n"
- "%func = OpFunction %void None %void_f\n"
- "%label = OpLabel\n"
- "OpReturn\n"
- "OpFunctionEnd\n",
- // expected
- "OpCapability Shader\n"
- "OpCapability VulkanMemoryModel\n"
- "OpExtension \"SPV_KHR_vulkan_memory_model\"\n"
- "OpMemoryModel Logical Vulkan\n"
- "OpEntryPoint Vertex %1 \"shader\"\n"
- "%void = OpTypeVoid\n"
- "%3 = OpTypeFunction %void\n"
- "%1 = OpFunction %void None %3\n"
- "%4 = OpLabel\n"
- "OpReturn\n"
- "OpFunctionEnd\n",
- // pass
- "strip-debug"},
// Eliminate Dead Constants
{// input
"OpCapability Shader\n"