Skip to content

Commit 28f9487

Browse files
V-FEXrtV-FEXrt
committed
Address comments
1 parent e520d0a commit 28f9487

9 files changed

Lines changed: 27 additions & 66 deletions

File tree

‎tools/clang/test/CodeGenDXIL/hlsl/linalg/builtins/matrixaccumulatetomemory/nominal.hlsl‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
// REQUIRES: dxil-1-10
22
// RUN: %dxc -T cs_6_10 -HV 202x -E main %s | FileCheck %s
33

4-
groupshared float SharedArr[64];
5-
6-
void fn(groupshared float Arr[64]) {
7-
__builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat;
8-
__builtin_LinAlg_MatrixAccumulateToMemory(mat, Arr, 0, 0, 0);
9-
}
10-
114
// CHECK: @{{.*}} = external addrspace(3) global [64 x float]
5+
groupshared float SharedArr[64];
126

137
[numthreads(4,1,1)]
148
void main() {
159
// CHECK-LABEL: define void @main()
1610

17-
// CHECK: call void @dx.op.linAlgMatrixAccumulateToMemory.mC4M5N4U1S2.f32(i32 -2147483620, %dx.types.LinAlgMatrixC4M5N4U1S2 {{.*}}, [64 x float] addrspace(3)* nonnull @{{.*}}, i32 0, i32 0, i32 0) ; LinAlgMatrixAccumulateToMemory(matrix,memory,offset,stride,layout)
18-
fn(SharedArr);
11+
// CHECK: call void @dx.op.linAlgMatrixAccumulateToMemory.mC4M5N4U1S2.f32(i32 -2147483620, %dx.types.LinAlgMatrixC4M5N4U1S2 {{.*}}, [64 x float] addrspace(3)* nonnull @{{.*}}, i32 1, i32 2, i32 3) ; LinAlgMatrixAccumulateToMemory(matrix,memory,offset,stride,layout)
12+
__builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat;
13+
__builtin_LinAlg_MatrixAccumulateToMemory(mat, SharedArr, 1, 2, 3);
1914
}

‎tools/clang/test/CodeGenDXIL/hlsl/linalg/builtins/matrixloadfrommemory/nominal.hlsl‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
// REQUIRES: dxil-1-10
22
// RUN: %dxc -T cs_6_10 -HV 202x -E main %s | FileCheck %s
33

4-
groupshared float SharedArr[64];
5-
6-
void fn(groupshared float Arr[64]) {
7-
__builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat;
8-
__builtin_LinAlg_MatrixLoadFromMemory(mat, Arr, 0, 0, 0);
9-
}
10-
114
// CHECK: @{{.*}} = external addrspace(3) global [64 x float]
5+
groupshared float SharedArr[64];
126

137
[numthreads(4,1,1)]
148
void main() {
159
// CHECK-LABEL: define void @main()
1610

17-
// CHECK: call %dx.types.LinAlgMatrixC4M5N4U1S2 @dx.op.linAlgMatrixLoadFromMemory.mC4M5N4U1S2.f32(i32 -2147483633, [64 x float] addrspace(3)* nonnull @{{.*}}, i32 0, i32 0, i32 0) ; LinAlgMatrixLoadFromMemory(memory,offset,stride,layout)
18-
fn(SharedArr);
11+
// CHECK: call %dx.types.LinAlgMatrixC4M5N4U1S2 @dx.op.linAlgMatrixLoadFromMemory.mC4M5N4U1S2.f32(i32 -2147483633, [64 x float] addrspace(3)* nonnull @{{.*}}, i32 1, i32 2, i32 3) ; LinAlgMatrixLoadFromMemory(memory,offset,stride,layout)
12+
__builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat;
13+
__builtin_LinAlg_MatrixLoadFromMemory(mat, SharedArr, 1, 2, 3);
1914
}

‎tools/clang/test/CodeGenDXIL/hlsl/linalg/builtins/matrixstoretomemory/nominal.hlsl‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
// REQUIRES: dxil-1-10
22
// RUN: %dxc -T cs_6_10 -HV 202x -E main %s | FileCheck %s
33

4-
groupshared float SharedArr[64];
5-
6-
void fn(groupshared float Arr[64]) {
7-
__builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat;
8-
__builtin_LinAlg_MatrixStoreToMemory(mat, Arr, 0, 0, 0);
9-
}
10-
114
// CHECK: @{{.*}} = external addrspace(3) global [64 x float]
5+
groupshared float SharedArr[64];
126

137
[numthreads(4,1,1)]
148
void main() {
159
// CHECK-LABEL: define void @main()
1610

17-
// CHECK: call void @dx.op.linAlgMatrixStoreToMemory.mC4M5N4U1S2.f32(i32 -2147483627, %dx.types.LinAlgMatrixC4M5N4U1S2 {{.*}}, [64 x float] addrspace(3)* nonnull @{{.*}}, i32 0, i32 0, i32 0) ; LinAlgMatrixStoreToMemory(matrix,memory,offset,stride,layout)
18-
fn(SharedArr);
11+
// CHECK: call void @dx.op.linAlgMatrixStoreToMemory.mC4M5N4U1S2.f32(i32 -2147483627, %dx.types.LinAlgMatrixC4M5N4U1S2 {{.*}}, [64 x float] addrspace(3)* nonnull @{{.*}}, i32 1, i32 2, i32 3) ; LinAlgMatrixStoreToMemory(matrix,memory,offset,stride,layout)
12+
__builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat;
13+
__builtin_LinAlg_MatrixStoreToMemory(mat, SharedArr, 1, 2, 3);
1914
}

‎tools/clang/test/SemaHLSL/hlsl/linalg/builtins/matrixaccumulatetomemory/ast.hlsl‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@
1212

1313
groupshared float SharedArr[64];
1414

15-
void fn(groupshared float Arr[64]) {
16-
__builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat;
17-
__builtin_LinAlg_MatrixAccumulateToMemory(mat, Arr, 0, 0, 0);
18-
}
19-
2015
[shader("compute")]
2116
[numthreads(1,1,1)]
2217
void main() {
23-
fn(SharedArr);
18+
__builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat;
19+
__builtin_LinAlg_MatrixAccumulateToMemory(mat, SharedArr, 0, 0, 0);
2420
}

‎tools/clang/test/SemaHLSL/hlsl/linalg/builtins/matrixaccumulatetomemory/unavailable_pre_sm610.hlsl‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22

33
groupshared float SharedArr[64];
44

5-
void fn(groupshared float Arr[64], float F) {
5+
[numthreads(4,1,1)]
6+
void main() {
67
__builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat;
78

89
// expected-error@+1{{intrinsic __builtin_LinAlg_MatrixAccumulateToMemory potentially used by ''main'' requires shader model 6.10 or greater}}
9-
__builtin_LinAlg_MatrixAccumulateToMemory(mat, Arr, 0, 0, 0);
10-
}
11-
12-
[numthreads(4,1,1)]
13-
void main() {
14-
fn(SharedArr, 6.0);
10+
__builtin_LinAlg_MatrixAccumulateToMemory(mat, SharedArr, 0, 0, 0);
1511
}

‎tools/clang/test/SemaHLSL/hlsl/linalg/builtins/matrixloadfrommemory/ast.hlsl‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@
1212

1313
groupshared float SharedArr[64];
1414

15-
void fn(groupshared float Arr[64]) {
16-
__builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat;
17-
__builtin_LinAlg_MatrixLoadFromMemory(mat, Arr, 0, 0, 0);
18-
}
19-
2015
[shader("compute")]
2116
[numthreads(1,1,1)]
2217
void main() {
23-
fn(SharedArr);
18+
__builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat;
19+
__builtin_LinAlg_MatrixLoadFromMemory(mat, SharedArr, 0, 0, 0);
2420
}

‎tools/clang/test/SemaHLSL/hlsl/linalg/builtins/matrixloadfrommemory/unavailable_pre_sm610.hlsl‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22

33
groupshared float SharedArr[64];
44

5-
void fn(groupshared float Arr[64], float F) {
5+
[numthreads(4,1,1)]
6+
void main() {
67
__builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat;
78

89
// expected-error@+1{{intrinsic __builtin_LinAlg_MatrixLoadFromMemory potentially used by ''main'' requires shader model 6.10 or greater}}
9-
__builtin_LinAlg_MatrixLoadFromMemory(mat, Arr, 0, 0, 0);
10-
}
11-
12-
[numthreads(4,1,1)]
13-
void main() {
14-
fn(SharedArr, 6.0);
10+
__builtin_LinAlg_MatrixLoadFromMemory(mat, SharedArr, 0, 0, 0);
1511
}

‎tools/clang/test/SemaHLSL/hlsl/linalg/builtins/matrixstoretomemory/ast.hlsl‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@
1212

1313
groupshared float SharedArr[64];
1414

15-
void fn(groupshared float Arr[64]) {
16-
__builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat;
17-
__builtin_LinAlg_MatrixStoreToMemory(mat, Arr, 0, 0, 0);
18-
}
19-
2015
[shader("compute")]
2116
[numthreads(1,1,1)]
2217
void main() {
23-
fn(SharedArr);
18+
__builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat;
19+
__builtin_LinAlg_MatrixStoreToMemory(mat, SharedArr, 0, 0, 0);
2420
}

‎tools/clang/test/SemaHLSL/hlsl/linalg/builtins/matrixstoretomemory/unavailable_pre_sm610.hlsl‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22

33
groupshared float SharedArr[64];
44

5-
void fn(groupshared float Arr[64], float F) {
5+
[numthreads(4,1,1)]
6+
void main() {
67
__builtin_LinAlgMatrix [[__LinAlgMatrix_Attributes(4, 5, 4, 1, 2)]] mat;
78

89
// expected-error@+1{{intrinsic __builtin_LinAlg_MatrixStoreToMemory potentially used by ''main'' requires shader model 6.10 or greater}}
9-
__builtin_LinAlg_MatrixStoreToMemory(mat, Arr, 0, 0, 0);
10-
}
11-
12-
[numthreads(4,1,1)]
13-
void main() {
14-
fn(SharedArr, 6.0);
10+
__builtin_LinAlg_MatrixStoreToMemory(mat, SharedArr, 0, 0, 0);
1511
}

0 commit comments

Comments
 (0)