compiletest: remove ShaderClockKHR from implied target features, naga does not support it

Firestar99 · Firestar99 · commit bc8d095c4333 · 2025-07-01T10:58:50.000+02:00
diff --git a/tests/compiletests/src/main.rs b/tests/compiletests/src/main.rs
@@ -342,15 +342,7 @@ struct TestDeps {
 /// The RUSTFLAGS passed to all SPIR-V builds.
 // FIXME(eddyb) expose most of these from `spirv-builder`.
 fn rust_flags(codegen_backend_path: &Path) -> String {
-    let target_features = [
-        "Int8",
-        "Int16",
-        "Int64",
-        "Float64",
-        // Only needed for `ui/arch/read_clock_khr.rs`.
-        "ShaderClockKHR",
-        "ext:SPV_KHR_shader_clock",
-    ];
+    let target_features = ["Int8", "Int16", "Int64", "Float64"];
 
     [
         &*format!("-Zcodegen-backend={}", codegen_backend_path.display()),
diff --git a/tests/compiletests/ui/dis/const-float-cast-optimized.stderr b/tests/compiletests/ui/dis/const-float-cast-optimized.stderr
@@ -1,7 +1,5 @@
 OpCapability Shader
 OpCapability Float64
-OpCapability ShaderClockKHR
-OpExtension "SPV_KHR_shader_clock"
 OpMemoryModel Logical Simple
 OpEntryPoint Fragment %1 "main" %2
 OpExecutionMode %1 OriginUpperLeft
diff --git a/tests/compiletests/ui/dis/const-float-cast.stderr b/tests/compiletests/ui/dis/const-float-cast.stderr
@@ -1,7 +1,5 @@
 OpCapability Shader
 OpCapability Float64
-OpCapability ShaderClockKHR
-OpExtension "SPV_KHR_shader_clock"
 OpMemoryModel Logical Simple
 OpEntryPoint Fragment %1 "main" %2
 OpExecutionMode %1 OriginUpperLeft
diff --git a/tests/compiletests/ui/dis/const-from-cast.stderr b/tests/compiletests/ui/dis/const-from-cast.stderr
@@ -1,6 +1,4 @@
 OpCapability Shader
-OpCapability ShaderClockKHR
-OpExtension "SPV_KHR_shader_clock"
 OpMemoryModel Logical Simple
 OpEntryPoint Fragment %1 "main" %2
 OpExecutionMode %1 OriginUpperLeft
diff --git a/tests/compiletests/ui/dis/const-int-cast.stderr b/tests/compiletests/ui/dis/const-int-cast.stderr
@@ -1,6 +1,4 @@
 OpCapability Shader
-OpCapability ShaderClockKHR
-OpExtension "SPV_KHR_shader_clock"
 OpMemoryModel Logical Simple
 OpEntryPoint Fragment %1 "main" %2
 OpExecutionMode %1 OriginUpperLeft
diff --git a/tests/compiletests/ui/dis/const-narrowing-cast.stderr b/tests/compiletests/ui/dis/const-narrowing-cast.stderr
@@ -1,7 +1,5 @@
 OpCapability Shader
 OpCapability Int8
-OpCapability ShaderClockKHR
-OpExtension "SPV_KHR_shader_clock"
 OpMemoryModel Logical Simple
 OpEntryPoint Fragment %1 "main" %2
 OpExecutionMode %1 OriginUpperLeft
diff --git a/tests/compiletests/ui/dis/custom_entry_point.stderr b/tests/compiletests/ui/dis/custom_entry_point.stderr
@@ -1,6 +1,4 @@
 OpCapability Shader
-OpCapability ShaderClockKHR
-OpExtension "SPV_KHR_shader_clock"
 OpMemoryModel Logical Simple
 OpEntryPoint Fragment %1 "hello_world"
 OpExecutionMode %1 OriginUpperLeft
diff --git a/tests/compiletests/ui/dis/generic-fn-op-name.stderr b/tests/compiletests/ui/dis/generic-fn-op-name.stderr
@@ -1,6 +1,4 @@
 OpCapability Shader
-OpCapability ShaderClockKHR
-OpExtension "SPV_KHR_shader_clock"
 OpMemoryModel Logical Simple
 OpEntryPoint Fragment %1 "main"
 OpExecutionMode %1 OriginUpperLeft
diff --git a/tests/compiletests/ui/dis/issue-723-output.stderr b/tests/compiletests/ui/dis/issue-723-output.stderr
@@ -1,6 +1,4 @@
 OpCapability Shader
-OpCapability ShaderClockKHR
-OpExtension "SPV_KHR_shader_clock"
 OpMemoryModel Logical Simple
 OpEntryPoint Fragment %1 "main" %2
 OpExecutionMode %1 OriginUpperLeft
diff --git a/tests/compiletests/ui/dis/panic_builtin_bounds_check.stderr b/tests/compiletests/ui/dis/panic_builtin_bounds_check.stderr
@@ -1,7 +1,5 @@
 OpCapability Shader
-OpCapability ShaderClockKHR
 OpExtension "SPV_KHR_non_semantic_info"
-OpExtension "SPV_KHR_shader_clock"
 %1 = OpExtInstImport "NonSemantic.DebugPrintf"
 OpMemoryModel Logical Simple
 OpEntryPoint Fragment %2 "main"
diff --git a/tests/compiletests/ui/dis/panic_sequential_many.stderr b/tests/compiletests/ui/dis/panic_sequential_many.stderr
@@ -1,7 +1,5 @@
 OpCapability Shader
-OpCapability ShaderClockKHR
 OpExtension "SPV_KHR_non_semantic_info"
-OpExtension "SPV_KHR_shader_clock"
 %1 = OpExtInstImport "NonSemantic.DebugPrintf"
 OpMemoryModel Logical Simple
 OpEntryPoint Fragment %2 "main" %3 %4 %5
