Skip to content

Commit 82efa59

Browse files
svenvhjsji
authored andcommitted
Fix kernel arg metadata in tests after opaque pointer conversion (#2136)
During previous bulk conversion of tests, occurrences of `half*`, `float*`, and `double*` in kernel metadata were inadvertently updated to `ptr`. Restore the original types. Original commit: KhronosGroup/SPIRV-LLVM-Translator@f5ab11d
1 parent e3b1fb4 commit 82efa59

13 files changed

+26
-26
lines changed

llvm-spirv/test/DebugInfo/Generic/undef-func-call.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ attributes #2 = { convergent }
8080
!9 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 3, type: !10, scopeLine: 3, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
8181
!10 = !DISubroutineType(types: !2)
8282
!11 = !{!"none", !"none"}
83-
!12 = !{!"ptr", !"int"}
83+
!12 = !{!"float*", !"int"}
8484
!13 = !{!"", !""}
8585
!14 = !DILocation(line: 5, column: 12, scope: !9)
8686
!15 = !DILocation(line: 5, column: 8, scope: !9)

llvm-spirv/test/extensions/INTEL/SPV_INTEL_runtime_aligned/RuntimeAligned.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ attributes #0 = { nounwind }
6060
!4 = !{i16 6, i16 14}
6161
!5 = !{i32 1, i32 1, i32 1, i32 0, i32 0}
6262
!6 = !{!"none", !"none", !"none", !"none", !"none"}
63-
!7 = !{!"int*", !"ptr", !"int*"}
63+
!7 = !{!"int*", !"float*", !"int*"}
6464
!8 = !{!"", !"", !"", !"", !""}
65-
!9 = !{!"int*", !"ptr", !"int*", !"int", !"int"}
65+
!9 = !{!"int*", !"float*", !"int*", !"int", !"int"}
6666
!10 = !{i1 true, i1 false, i1 true, i1 false, i1 false}

llvm-spirv/test/transcoding/OpImageSampleExplicitLod.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ attributes #1 = { nounwind }
6060

6161
!1 = !{i32 1, i32 0, i32 1, i32 1, i32 1}
6262
!2 = !{!"read_only", !"none", !"none", !"none", !"none"}
63-
!3 = !{!"image2d_depth_t", !"sampler_t", !"ptr", !"ptr", !"ptr"}
63+
!3 = !{!"image2d_depth_t", !"sampler_t", !"float*", !"float*", !"float*"}
6464
!4 = !{!"", !"", !"", !"", !""}
65-
!5 = !{!"image2d_depth_t", !"sampler_t", !"ptr", !"ptr", !"ptr"}
65+
!5 = !{!"image2d_depth_t", !"sampler_t", !"float*", !"float*", !"float*"}
6666
!6 = !{i32 2, i32 0}
6767
!7 = !{!"cl_khr_depth_images"}
6868
!8 = !{!"cl_images"}

llvm-spirv/test/transcoding/OpVectorExtractDynamic.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ attributes #0 = { nounwind }
3838

3939
!1 = !{i32 1, i32 0}
4040
!2 = !{!"none", !"none", !"none"}
41-
!3 = !{!"ptr", !"float2", !"int"}
42-
!4 = !{!"ptr", !"float2", !"int"}
41+
!3 = !{!"float*", !"float2", !"int"}
42+
!4 = !{!"float*", !"float2", !"int"}
4343
!5 = !{!"", !"", !""}
4444
!6 = !{i32 1, i32 2}
4545
!7 = !{i32 2, i32 0}

llvm-spirv/test/transcoding/builtin_function_readnone_attr.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ attributes #2 = { convergent nounwind }
4747
!2 = !{!"clang version 12.0.0 (https://github.com/intel/llvm 275e05b9dc13deb44eb7c765d23e65358d6bd077)"}
4848
!3 = !{i32 1, i32 1}
4949
!4 = !{!"none", !"none"}
50-
!5 = !{!"ptr", !"ptr"}
50+
!5 = !{!"double*", !"double*"}
5151
!6 = !{!"", !""}
5252
!7 = !{!8, !8, i64 0}
5353
!8 = !{!"double", !9, i64 0}

llvm-spirv/test/transcoding/fclamp.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ attributes #2 = { nounwind }
4343

4444
!1 = !{i32 1}
4545
!2 = !{!"none"}
46-
!3 = !{!"ptr"}
47-
!4 = !{!"ptr"}
46+
!3 = !{!"float*"}
47+
!4 = !{!"float*"}
4848
!5 = !{!""}
4949
!6 = !{i32 1, i32 2}
5050
!7 = !{i32 2, i32 0}

llvm-spirv/test/transcoding/kernel_arg_type_qual.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ attributes #1 = { convergent noinline norecurse nounwind optnone }
3939
!2 = !{!"clang version 13.0.0"}
4040
!3 = !{i32 1, i32 1}
4141
!4 = !{!"none", !"none"}
42-
!5 = !{!"ptr", !"ptr"}
42+
!5 = !{!"float*", !"float*"}
4343
!6 = !{!"volatile", !"const", !""}

llvm-spirv/test/transcoding/relationals_select.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ attributes #2 = { convergent nounwind willreturn memory(none) }
118118
!2 = !{!"clang version 16.0.0"}
119119
!3 = !{i32 1, i32 1}
120120
!4 = !{!"none", !"none"}
121-
!5 = !{!"long*", !"ptr"}
121+
!5 = !{!"long*", !"double*"}
122122
!6 = !{!"", !""}
123123
!7 = !{!8, !8, i64 0}
124124
!8 = !{!"double", !9, i64 0}

llvm-spirv/test/transcoding/spec_const.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,6 @@ attributes #0 = { nofree norecurse nounwind writeonly "correctly-rounded-divide-
9999
!2 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git f11016b41a94d2bad8824d5e2833d141fda24502)"}
100100
!3 = !{i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1}
101101
!4 = !{!"none", !"none", !"none", !"none", !"none", !"none", !"none", !"none"}
102-
!5 = !{!"bool*", !"char*", !"short*", !"int*", !"long*", !"ptr", !"ptr", !"ptr"}
102+
!5 = !{!"bool*", !"char*", !"short*", !"int*", !"long*", !"half*", !"float*", !"double*"}
103103
!6 = !{!"", !"", !"", !"", !"", !"", !"", !""}
104104
!7 = !{!"cl_khr_fp16"}

llvm-spirv/test/transcoding/sub_group_clustered_reduce.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,12 +1101,12 @@ attributes #2 = { convergent nounwind }
11011101
!20 = !{!21, !21, i64 0}
11021102
!21 = !{!"long", !8, i64 0}
11031103
!22 = !{!"ulong*"}
1104-
!23 = !{!"ptr"}
1104+
!23 = !{!"float*"}
11051105
!24 = !{!25, !25, i64 0}
11061106
!25 = !{!"float", !8, i64 0}
1107-
!26 = !{!"ptr"}
1107+
!26 = !{!"half*"}
11081108
!27 = !{!28, !28, i64 0}
11091109
!28 = !{!"half", !8, i64 0}
1110-
!29 = !{!"ptr"}
1110+
!29 = !{!"double*"}
11111111
!30 = !{!31, !31, i64 0}
11121112
!31 = !{!"double", !8, i64 0}

llvm-spirv/test/transcoding/sub_group_non_uniform_arithmetic.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2514,12 +2514,12 @@ attributes #2 = { convergent nounwind }
25142514
!20 = !{!21, !21, i64 0}
25152515
!21 = !{!"long", !8, i64 0}
25162516
!22 = !{!"ulong*"}
2517-
!23 = !{!"ptr"}
2517+
!23 = !{!"float*"}
25182518
!24 = !{!25, !25, i64 0}
25192519
!25 = !{!"float", !8, i64 0}
2520-
!26 = !{!"ptr"}
2520+
!26 = !{!"half*"}
25212521
!27 = !{!28, !28, i64 0}
25222522
!28 = !{!"half", !8, i64 0}
2523-
!29 = !{!"ptr"}
2523+
!29 = !{!"double*"}
25242524
!30 = !{!31, !31, i64 0}
2525-
!31 = !{!"double", !8, i64 0}
2525+
!31 = !{!"double", !8, i64 0}

llvm-spirv/test/transcoding/sub_group_shuffle.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -464,13 +464,13 @@ attributes #2 = { convergent nounwind }
464464
!20 = !{!21, !21, i64 0}
465465
!21 = !{!"long", !8, i64 0}
466466
!22 = !{!"ulong*"}
467-
!23 = !{!"ptr"}
467+
!23 = !{!"float*"}
468468
!24 = !{!25, !25, i64 0}
469469
!25 = !{!"float", !8, i64 0}
470-
!26 = !{!"ptr"}
470+
!26 = !{!"half*"}
471471
!27 = !{!28, !28, i64 0}
472472
!28 = !{!"half", !8, i64 0}
473-
!29 = !{!"ptr"}
473+
!29 = !{!"double*"}
474474
!30 = !{!31, !31, i64 0}
475475
!31 = !{!"double", !8, i64 0}
476476

llvm-spirv/test/transcoding/sub_group_shuffle_relative.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,12 +418,12 @@ attributes #2 = { convergent nounwind }
418418
!20 = !{!21, !21, i64 0}
419419
!21 = !{!"long", !8, i64 0}
420420
!22 = !{!"ulong*"}
421-
!23 = !{!"ptr"}
421+
!23 = !{!"float*"}
422422
!24 = !{!25, !25, i64 0}
423423
!25 = !{!"float", !8, i64 0}
424-
!26 = !{!"ptr"}
424+
!26 = !{!"half*"}
425425
!27 = !{!28, !28, i64 0}
426426
!28 = !{!"half", !8, i64 0}
427-
!29 = !{!"ptr"}
427+
!29 = !{!"double*"}
428428
!30 = !{!31, !31, i64 0}
429429
!31 = !{!"double", !8, i64 0}

0 commit comments

Comments
 (0)