diff --git a/tools/clang/test/CodeGenSPIRV/attribute.domain.isoline.hlsl b/tools/clang/test/CodeGenSPIRV/attribute.domain.isoline.hlsl index e2d0d7a7bf..ab1316f3e2 100644 --- a/tools/clang/test/CodeGenSPIRV/attribute.domain.isoline.hlsl +++ b/tools/clang/test/CodeGenSPIRV/attribute.domain.isoline.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E SubDToBezierHS -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" // CHECK: OpExecutionMode %SubDToBezierHS Isoline diff --git a/tools/clang/test/CodeGenSPIRV/attribute.domain.quad.hlsl b/tools/clang/test/CodeGenSPIRV/attribute.domain.quad.hlsl index c9d67c9e2a..bfb63bc800 100644 --- a/tools/clang/test/CodeGenSPIRV/attribute.domain.quad.hlsl +++ b/tools/clang/test/CodeGenSPIRV/attribute.domain.quad.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E SubDToBezierHS -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" // CHECK: OpExecutionMode %SubDToBezierHS Quads diff --git a/tools/clang/test/CodeGenSPIRV/attribute.domain.tri.hlsl b/tools/clang/test/CodeGenSPIRV/attribute.domain.tri.hlsl index ffdcf9b502..9d1b569b0b 100644 --- a/tools/clang/test/CodeGenSPIRV/attribute.domain.tri.hlsl +++ b/tools/clang/test/CodeGenSPIRV/attribute.domain.tri.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E SubDToBezierHS -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" // CHECK: OpExecutionMode %SubDToBezierHS Triangle diff --git a/tools/clang/test/CodeGenSPIRV/attribute.outputcontrolpoints.hlsl b/tools/clang/test/CodeGenSPIRV/attribute.outputcontrolpoints.hlsl index c5b65f91cd..2f834f7431 100644 --- a/tools/clang/test/CodeGenSPIRV/attribute.outputcontrolpoints.hlsl +++ b/tools/clang/test/CodeGenSPIRV/attribute.outputcontrolpoints.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E SubDToBezierHS -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" [domain("tri")] [partitioning("fractional_odd")] diff --git a/tools/clang/test/CodeGenSPIRV/attribute.outputtopology.point.hlsl b/tools/clang/test/CodeGenSPIRV/attribute.outputtopology.point.hlsl index a050bc524b..33bdbe6a98 100644 --- a/tools/clang/test/CodeGenSPIRV/attribute.outputtopology.point.hlsl +++ b/tools/clang/test/CodeGenSPIRV/attribute.outputtopology.point.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E SubDToBezierHS -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" [domain("tri")] [partitioning("fractional_odd")] diff --git a/tools/clang/test/CodeGenSPIRV/attribute.outputtopology.triangle-ccw.hlsl b/tools/clang/test/CodeGenSPIRV/attribute.outputtopology.triangle-ccw.hlsl index 78e608334c..7cb878e8a8 100644 --- a/tools/clang/test/CodeGenSPIRV/attribute.outputtopology.triangle-ccw.hlsl +++ b/tools/clang/test/CodeGenSPIRV/attribute.outputtopology.triangle-ccw.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E SubDToBezierHS -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" [domain("tri")] [partitioning("fractional_odd")] diff --git a/tools/clang/test/CodeGenSPIRV/attribute.outputtopology.triangle-cw.hlsl b/tools/clang/test/CodeGenSPIRV/attribute.outputtopology.triangle-cw.hlsl index bd76bbdf40..b1a7cd649c 100644 --- a/tools/clang/test/CodeGenSPIRV/attribute.outputtopology.triangle-cw.hlsl +++ b/tools/clang/test/CodeGenSPIRV/attribute.outputtopology.triangle-cw.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E SubDToBezierHS -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" [domain("tri")] [partitioning("fractional_odd")] diff --git a/tools/clang/test/CodeGenSPIRV/attribute.partitioning.fractional-even.hlsl b/tools/clang/test/CodeGenSPIRV/attribute.partitioning.fractional-even.hlsl index 3bfda94c55..cd4b3db72d 100644 --- a/tools/clang/test/CodeGenSPIRV/attribute.partitioning.fractional-even.hlsl +++ b/tools/clang/test/CodeGenSPIRV/attribute.partitioning.fractional-even.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E SubDToBezierHS -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" [domain("tri")] diff --git a/tools/clang/test/CodeGenSPIRV/attribute.partitioning.fractional-odd.hlsl b/tools/clang/test/CodeGenSPIRV/attribute.partitioning.fractional-odd.hlsl index 448f5ab2d9..66ffbb7fe5 100644 --- a/tools/clang/test/CodeGenSPIRV/attribute.partitioning.fractional-odd.hlsl +++ b/tools/clang/test/CodeGenSPIRV/attribute.partitioning.fractional-odd.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E SubDToBezierHS -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" [domain("tri")] diff --git a/tools/clang/test/CodeGenSPIRV/attribute.partitioning.integer.hlsl b/tools/clang/test/CodeGenSPIRV/attribute.partitioning.integer.hlsl index 3592c5dfa0..e71e0b95ef 100644 --- a/tools/clang/test/CodeGenSPIRV/attribute.partitioning.integer.hlsl +++ b/tools/clang/test/CodeGenSPIRV/attribute.partitioning.integer.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E SubDToBezierHS -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" [domain("tri")] diff --git a/tools/clang/test/CodeGenSPIRV/bezier_common_hull.hlsl b/tools/clang/test/CodeGenSPIRV/bezier_common_hull.hlsli similarity index 100% rename from tools/clang/test/CodeGenSPIRV/bezier_common_hull.hlsl rename to tools/clang/test/CodeGenSPIRV/bezier_common_hull.hlsli diff --git a/tools/clang/test/CodeGenSPIRV/hs.pcf.input-patch.hlsl b/tools/clang/test/CodeGenSPIRV/hs.pcf.input-patch.hlsl index 1fa87ace6f..924d30a233 100644 --- a/tools/clang/test/CodeGenSPIRV/hs.pcf.input-patch.hlsl +++ b/tools/clang/test/CodeGenSPIRV/hs.pcf.input-patch.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E main -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" // Test: PCF takes the input control points (InputPatch) diff --git a/tools/clang/test/CodeGenSPIRV/hs.pcf.output-patch.hlsl b/tools/clang/test/CodeGenSPIRV/hs.pcf.output-patch.hlsl index 769a93c65a..539cdfda1e 100644 --- a/tools/clang/test/CodeGenSPIRV/hs.pcf.output-patch.hlsl +++ b/tools/clang/test/CodeGenSPIRV/hs.pcf.output-patch.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E main -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" // Test: PCF takes the output (OutputPatch) of the main entry point function. diff --git a/tools/clang/test/CodeGenSPIRV/hs.pcf.primitive-id.1.hlsl b/tools/clang/test/CodeGenSPIRV/hs.pcf.primitive-id.1.hlsl index 6b31fa36ab..0af36d4018 100644 --- a/tools/clang/test/CodeGenSPIRV/hs.pcf.primitive-id.1.hlsl +++ b/tools/clang/test/CodeGenSPIRV/hs.pcf.primitive-id.1.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E main -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" // Test: PCF takes the PrimitiveID // Note that in this test, the main entry point has also taken the PrimitiveID as input. diff --git a/tools/clang/test/CodeGenSPIRV/hs.pcf.primitive-id.2.hlsl b/tools/clang/test/CodeGenSPIRV/hs.pcf.primitive-id.2.hlsl index 0e5e1a1c0e..0dbb75c12b 100644 --- a/tools/clang/test/CodeGenSPIRV/hs.pcf.primitive-id.2.hlsl +++ b/tools/clang/test/CodeGenSPIRV/hs.pcf.primitive-id.2.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E main -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" // Test: PCF takes the PrimitiveID // Note that in this test, the main entry point *DOES NOT* take the PrimitiveID as input. diff --git a/tools/clang/test/CodeGenSPIRV/hs.pcf.void.hlsl b/tools/clang/test/CodeGenSPIRV/hs.pcf.void.hlsl index 0b98dcc84f..4e47bce71c 100644 --- a/tools/clang/test/CodeGenSPIRV/hs.pcf.void.hlsl +++ b/tools/clang/test/CodeGenSPIRV/hs.pcf.void.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E main -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" // CHECK: [[fType:%\d+]] = OpTypeFunction %HS_CONSTANT_DATA_OUTPUT // CHECK: %main = OpFunction %void None {{%\d+}} diff --git a/tools/clang/test/CodeGenSPIRV/hs.structure.hlsl b/tools/clang/test/CodeGenSPIRV/hs.structure.hlsl index 834666c0b2..5e4e2a7fb3 100644 --- a/tools/clang/test/CodeGenSPIRV/hs.structure.hlsl +++ b/tools/clang/test/CodeGenSPIRV/hs.structure.hlsl @@ -1,6 +1,6 @@ // RUN: %dxc -T hs_6_0 -E main -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" // This test ensures: // 1- The hull shader entry point function is invoked. diff --git a/tools/clang/test/CodeGenSPIRV/rich.debug.debugsource.multiple.hlsl b/tools/clang/test/CodeGenSPIRV/rich.debug.debugsource.multiple.hlsl index 3378849d37..369e3778ec 100644 --- a/tools/clang/test/CodeGenSPIRV/rich.debug.debugsource.multiple.hlsl +++ b/tools/clang/test/CodeGenSPIRV/rich.debug.debugsource.multiple.hlsl @@ -3,11 +3,11 @@ // CHECK: [[debugSet:%\d+]] = OpExtInstImport "OpenCL.DebugInfo.100" // CHECK: rich.debug.debugsource.multiple.hlsl -// CHECK: spirv.debug.opline.include-file-3.hlsl +// CHECK: spirv.debug.opline.include-file-3.hlsli // CHECK: [[file3_code:%\d+]] = OpString "int b; -// CHECK: spirv.debug.opline.include-file-2.hlsl +// CHECK: spirv.debug.opline.include-file-2.hlsli // CHECK: [[file2_code:%\d+]] = OpString "static int a; -// CHECK: spirv.debug.opline.include-file-1.hlsl +// CHECK: spirv.debug.opline.include-file-1.hlsli // CHECK: [[file1_code:%\d+]] = OpString "int function1() { // CHECK: [[main_code:%\d+]] = OpString "// RUN: %dxc -T ps_6_0 -E main -fspv-debug=rich-with-source @@ -16,19 +16,19 @@ // CHECK: {{%\d+}} = OpExtInst %void [[debugSet]] DebugSource {{%\d+}} [[file1_code]] // CHECK: {{%\d+}} = OpExtInst %void [[debugSet]] DebugSource {{%\d+}} [[main_code]] -#include "spirv.debug.opline.include-file-1.hlsl" +#include "spirv.debug.opline.include-file-1.hlsli" int callFunction1() { return function1(); } -#include "spirv.debug.opline.include-file-2.hlsl" +#include "spirv.debug.opline.include-file-2.hlsli" int callFunction2() { return function2(); } -#include "spirv.debug.opline.include-file-3.hlsl" +#include "spirv.debug.opline.include-file-3.hlsli" int callFunction3() { CALL_FUNCTION_3; diff --git a/tools/clang/test/CodeGenSPIRV/rich.debug.function.parent.hlsl b/tools/clang/test/CodeGenSPIRV/rich.debug.function.parent.hlsl index 3126fbd882..28da72b6d7 100644 --- a/tools/clang/test/CodeGenSPIRV/rich.debug.function.parent.hlsl +++ b/tools/clang/test/CodeGenSPIRV/rich.debug.function.parent.hlsl @@ -3,27 +3,27 @@ // CHECK: [[set:%\d+]] = OpExtInstImport "OpenCL.DebugInfo.100" // CHECK: rich.debug.function.parent.hlsl -// CHECK: spirv.debug.opline.include-file-3.hlsl +// CHECK: spirv.debug.opline.include-file-3.hlsli // CHECK: [[f3:%\d+]] = OpString "function3" -// CHECK: spirv.debug.opline.include-file-2.hlsl +// CHECK: spirv.debug.opline.include-file-2.hlsli // CHECK: [[f2:%\d+]] = OpString "function2" -// CHECK: spirv.debug.opline.include-file-1.hlsl +// CHECK: spirv.debug.opline.include-file-1.hlsli // CHECK: [[f1:%\d+]] = OpString "function1" -#include "spirv.debug.opline.include-file-1.hlsl" +#include "spirv.debug.opline.include-file-1.hlsli" int callFunction1() { return function1(); } -#include "spirv.debug.opline.include-file-2.hlsl" +#include "spirv.debug.opline.include-file-2.hlsli" int callFunction2() { return function2(); } -#include "spirv.debug.opline.include-file-3.hlsl" +#include "spirv.debug.opline.include-file-3.hlsli" int callFunction3() { CALL_FUNCTION_3; diff --git a/tools/clang/test/CodeGenSPIRV/semantic.inside-tess-factor.hs.hlsl b/tools/clang/test/CodeGenSPIRV/semantic.inside-tess-factor.hs.hlsl index 647161298b..2e1c82c059 100644 --- a/tools/clang/test/CodeGenSPIRV/semantic.inside-tess-factor.hs.hlsl +++ b/tools/clang/test/CodeGenSPIRV/semantic.inside-tess-factor.hs.hlsl @@ -8,7 +8,7 @@ // CHECK: %gl_TessLevelInner = OpVariable %_ptr_Output__arr_float_uint_2 Output -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" [domain("quad")] [partitioning("fractional_odd")] diff --git a/tools/clang/test/CodeGenSPIRV/semantic.output-control-point-id.hs.hlsl b/tools/clang/test/CodeGenSPIRV/semantic.output-control-point-id.hs.hlsl index 48b71af46b..79db8cd5ca 100644 --- a/tools/clang/test/CodeGenSPIRV/semantic.output-control-point-id.hs.hlsl +++ b/tools/clang/test/CodeGenSPIRV/semantic.output-control-point-id.hs.hlsl @@ -7,7 +7,7 @@ // CHECK: %gl_InvocationID = OpVariable %_ptr_Input_uint Input -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" [domain("quad")] [partitioning("fractional_odd")] diff --git a/tools/clang/test/CodeGenSPIRV/semantic.primitive-id.hs.hlsl b/tools/clang/test/CodeGenSPIRV/semantic.primitive-id.hs.hlsl index 59f20e6ea7..be5cebd1ce 100644 --- a/tools/clang/test/CodeGenSPIRV/semantic.primitive-id.hs.hlsl +++ b/tools/clang/test/CodeGenSPIRV/semantic.primitive-id.hs.hlsl @@ -7,7 +7,7 @@ // CHECK: %gl_PrimitiveID = OpVariable %_ptr_Input_uint Input -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" [domain("quad")] [partitioning("fractional_odd")] diff --git a/tools/clang/test/CodeGenSPIRV/semantic.tess-factor.hs.hlsl b/tools/clang/test/CodeGenSPIRV/semantic.tess-factor.hs.hlsl index e79bcc88f5..918c9f6712 100644 --- a/tools/clang/test/CodeGenSPIRV/semantic.tess-factor.hs.hlsl +++ b/tools/clang/test/CodeGenSPIRV/semantic.tess-factor.hs.hlsl @@ -8,7 +8,7 @@ // CHECK: %gl_TessLevelOuter = OpVariable %_ptr_Output__arr_float_uint_4 Output -#include "bezier_common_hull.hlsl" +#include "bezier_common_hull.hlsli" [domain("quad")] [partitioning("fractional_odd")] diff --git a/tools/clang/test/CodeGenSPIRV/shader.debug.line.include.hlsl b/tools/clang/test/CodeGenSPIRV/shader.debug.line.include.hlsl index 36e1494c3e..de1922761c 100644 --- a/tools/clang/test/CodeGenSPIRV/shader.debug.line.include.hlsl +++ b/tools/clang/test/CodeGenSPIRV/shader.debug.line.include.hlsl @@ -4,14 +4,14 @@ // CHECK-SAME: shader.debug.line.include.hlsl // CHECK: OpString // CHECK: [[file3:%\d+]] = OpString -// CHECK-SAME: spirv.debug.opline.include-file-3.hlsl +// CHECK-SAME: spirv.debug.opline.include-file-3.hlsli // CHECK: OpString // CHECK: OpString // CHECK: [[file2:%\d+]] = OpString -// CHECK-SAME: spirv.debug.opline.include-file-2.hlsl +// CHECK-SAME: spirv.debug.opline.include-file-2.hlsli // CHECK: OpString // CHECK: [[file1:%\d+]] = OpString -// CHECK-SAME: spirv.debug.opline.include-file-1.hlsl +// CHECK-SAME: spirv.debug.opline.include-file-1.hlsli // CHECK: [[src3:%\d+]] = OpExtInst %void %1 DebugSource [[file3]] // CHECK: [[src2:%\d+]] = OpExtInst %void %1 DebugSource [[file2]] // CHECK: [[src1:%\d+]] = OpExtInst %void %1 DebugSource [[file1]] @@ -20,13 +20,13 @@ // DebugLine cannot preceed OpFunction // CHECK: %src_main = OpFunction %void None -#include "spirv.debug.opline.include-file-1.hlsl" +#include "spirv.debug.opline.include-file-1.hlsli" int callFunction1() { return function1(); } -#include "spirv.debug.opline.include-file-2.hlsl" +#include "spirv.debug.opline.include-file-2.hlsli" int callFunction2() { // This @@ -46,7 +46,7 @@ int callFunction2() { return function2(); } -#include "spirv.debug.opline.include-file-3.hlsl" +#include "spirv.debug.opline.include-file-3.hlsli" int callFunction3() { // This diff --git a/tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include-file-1.hlsl b/tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include-file-1.hlsli similarity index 100% rename from tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include-file-1.hlsl rename to tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include-file-1.hlsli diff --git a/tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include-file-2.hlsl b/tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include-file-2.hlsli similarity index 100% rename from tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include-file-2.hlsl rename to tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include-file-2.hlsli diff --git a/tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include-file-3.hlsl b/tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include-file-3.hlsli similarity index 100% rename from tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include-file-3.hlsl rename to tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include-file-3.hlsli diff --git a/tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include.hlsl b/tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include.hlsl index b9867de608..05e31fd40e 100644 --- a/tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include.hlsl +++ b/tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include.hlsl @@ -4,25 +4,25 @@ // CHECK-SAME: spirv.debug.opline.include.hlsl // CHECK-NEXT: OpSource HLSL 600 [[main]] "// RUN: %dxc -T ps_6_0 -E main -Zi // CHECK: [[file1:%\d+]] = OpString -// CHECK-SAME: spirv.debug.opline.include-file-1.hlsl +// CHECK-SAME: spirv.debug.opline.include-file-1.hlsli // CHECK-NEXT: OpSource HLSL 600 [[file1]] "int function1() { // CHECK: [[file2:%\d+]] = OpString -// CHECK-SAME: spirv.debug.opline.include-file-2.hlsl +// CHECK-SAME: spirv.debug.opline.include-file-2.hlsli // CHECK-NEXT: OpSource HLSL 600 [[file2]] "static int a; // CHECK: [[file3:%\d+]] = OpString -// CHECK-SAME: spirv.debug.opline.include-file-3.hlsl +// CHECK-SAME: spirv.debug.opline.include-file-3.hlsli // CHECK-NEXT: OpSource HLSL 600 [[file3]] "int b; // CHECK: OpLine [[main]] 65 1 // CHECK-NEXT: %src_main = OpFunction %void None -#include "spirv.debug.opline.include-file-1.hlsl" +#include "spirv.debug.opline.include-file-1.hlsli" int callFunction1() { return function1(); } -#include "spirv.debug.opline.include-file-2.hlsl" +#include "spirv.debug.opline.include-file-2.hlsli" int callFunction2() { // This @@ -42,7 +42,7 @@ int callFunction2() { return function2(); } -#include "spirv.debug.opline.include-file-3.hlsl" +#include "spirv.debug.opline.include-file-3.hlsli" int callFunction3() { // This