Skip to content

Commit

Permalink
[NFC] [lit] [SPIRV] change header ext from hlsl to hlsli (microsoft#5304
Browse files Browse the repository at this point in the history
)

This is to avoid lit treat the headers with hlsl ext as Unresolved
Tests.
  • Loading branch information
python3kgae authored Jun 22, 2023
1 parent e8b1fcb commit 3dc858f
Show file tree
Hide file tree
Showing 28 changed files with 44 additions and 44 deletions.
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion tools/clang/test/CodeGenSPIRV/attribute.domain.quad.hlsl
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion tools/clang/test/CodeGenSPIRV/attribute.domain.tri.hlsl
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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")]
Expand Down
Original file line number Diff line number Diff line change
@@ -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")]
Expand Down
Original file line number Diff line number Diff line change
@@ -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")]
Expand Down
Original file line number Diff line number Diff line change
@@ -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")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// RUN: %dxc -T hs_6_0 -E SubDToBezierHS

#include "bezier_common_hull.hlsl"
#include "bezier_common_hull.hlsli"


[domain("tri")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// RUN: %dxc -T hs_6_0 -E SubDToBezierHS

#include "bezier_common_hull.hlsl"
#include "bezier_common_hull.hlsli"


[domain("tri")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// RUN: %dxc -T hs_6_0 -E SubDToBezierHS

#include "bezier_common_hull.hlsl"
#include "bezier_common_hull.hlsli"


[domain("tri")]
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/test/CodeGenSPIRV/hs.pcf.input-patch.hlsl
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion tools/clang/test/CodeGenSPIRV/hs.pcf.output-patch.hlsl
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion tools/clang/test/CodeGenSPIRV/hs.pcf.primitive-id.1.hlsl
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/test/CodeGenSPIRV/hs.pcf.primitive-id.2.hlsl
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/test/CodeGenSPIRV/hs.pcf.void.hlsl
Original file line number Diff line number Diff line change
@@ -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+}}
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/test/CodeGenSPIRV/hs.structure.hlsl
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions tools/clang/test/CodeGenSPIRV/rich.debug.function.parent.hlsl
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion tools/clang/test/CodeGenSPIRV/semantic.tess-factor.hs.hlsl
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
12 changes: 6 additions & 6 deletions tools/clang/test/CodeGenSPIRV/shader.debug.line.include.hlsl
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand All @@ -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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions tools/clang/test/CodeGenSPIRV/spirv.debug.opline.include.hlsl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 3dc858f

Please sign in to comment.