Commit 3f56f92
committed
[SYCL] Elizabeth's changes to emit OpenCL kernel metadata for SYCL kernels.
Elizabeth's changes to perform code generation for SYCL kernel device entry
point functions caused the following kernel metadata annotations to be
emitted for all device targets.
- `kernel_arg_addr_space`
- `kernel_arg_access_qual`
- `kernel_arg_type`
- `kernel_arg_base_type`
- `kernel_arg_type_qual`
It turns out that such metadata is not needed for SYCL; the above annotations
are only needed for OpenCL. Investigation revealed that these annotations are
emitted by the oneAPI compiler for ESIMD functions, but that was apparently
due to an incorrect merge conflict resolution that is now being addressed by
intel/llvm#17723.
The above annotations are referenced by the SPIR-V Translator documentation.
See https://github.com/KhronosGroup/SPIRV-LLVM-Translator/blob/main/docs/SPIRVRepresentationInLLVM.rst#function-metadata.
The oneAPI compiler does emit a `kernel_arg_buffer_location` annotation that
is presumed to be needed as part of the support for the dead kernel argument
elimination pass. Support for that annotation does not yet exist upstream.1 parent ffeadec commit 3f56f92
File tree
6 files changed
+104
-48
lines changed- clang
- lib/CodeGen
- test/CodeGenSYCL
6 files changed
+104
-48
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
619 | 619 | | |
620 | 620 | | |
621 | 621 | | |
622 | | - | |
623 | | - | |
624 | | - | |
625 | | - | |
626 | | - | |
| 622 | + | |
| 623 | + | |
627 | 624 | | |
628 | | - | |
629 | | - | |
| 625 | + | |
630 | 626 | | |
631 | 627 | | |
632 | 628 | | |
633 | 629 | | |
634 | 630 | | |
635 | 631 | | |
636 | | - | |
| 632 | + | |
637 | 633 | | |
638 | 634 | | |
639 | 635 | | |
| |||
648 | 644 | | |
649 | 645 | | |
650 | 646 | | |
651 | | - | |
| 647 | + | |
652 | 648 | | |
653 | | - | |
| 649 | + | |
654 | 650 | | |
655 | 651 | | |
656 | 652 | | |
| |||
659 | 655 | | |
660 | 656 | | |
661 | 657 | | |
662 | | - | |
| 658 | + | |
663 | 659 | | |
664 | | - | |
| 660 | + | |
665 | 661 | | |
666 | 662 | | |
667 | 663 | | |
| |||
671 | 667 | | |
672 | 668 | | |
673 | 669 | | |
674 | | - | |
| 670 | + | |
675 | 671 | | |
676 | 672 | | |
677 | 673 | | |
| |||
751 | 747 | | |
752 | 748 | | |
753 | 749 | | |
754 | | - | |
755 | | - | |
756 | | - | |
757 | | - | |
758 | | - | |
759 | | - | |
| 750 | + | |
| 751 | + | |
| 752 | + | |
| 753 | + | |
| 754 | + | |
760 | 755 | | |
761 | 756 | | |
762 | 757 | | |
763 | 758 | | |
764 | 759 | | |
| 760 | + | |
| 761 | + | |
| 762 | + | |
| 763 | + | |
| 764 | + | |
| 765 | + | |
| 766 | + | |
| 767 | + | |
765 | 768 | | |
766 | 769 | | |
767 | 770 | | |
| |||
1026 | 1029 | | |
1027 | 1030 | | |
1028 | 1031 | | |
1029 | | - | |
1030 | | - | |
1031 | | - | |
1032 | | - | |
1033 | | - | |
| 1032 | + | |
| 1033 | + | |
| 1034 | + | |
| 1035 | + | |
| 1036 | + | |
| 1037 | + | |
1034 | 1038 | | |
1035 | | - | |
| 1039 | + | |
1036 | 1040 | | |
1037 | 1041 | | |
1038 | 1042 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2184 | 2184 | | |
2185 | 2185 | | |
2186 | 2186 | | |
2187 | | - | |
| 2187 | + | |
2188 | 2188 | | |
2189 | | - | |
| 2189 | + | |
| 2190 | + | |
2190 | 2191 | | |
2191 | 2192 | | |
2192 | 2193 | | |
| |||
2422 | 2423 | | |
2423 | 2424 | | |
2424 | 2425 | | |
2425 | | - | |
| 2426 | + | |
| 2427 | + | |
2426 | 2428 | | |
2427 | 2429 | | |
2428 | 2430 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2291 | 2291 | | |
2292 | 2292 | | |
2293 | 2293 | | |
2294 | | - | |
2295 | | - | |
2296 | | - | |
2297 | | - | |
2298 | | - | |
| 2294 | + | |
| 2295 | + | |
| 2296 | + | |
| 2297 | + | |
| 2298 | + | |
2299 | 2299 | | |
2300 | 2300 | | |
2301 | 2301 | | |
2302 | 2302 | | |
| 2303 | + | |
| 2304 | + | |
2303 | 2305 | | |
2304 | 2306 | | |
2305 | 2307 | | |
| |||
2320 | 2322 | | |
2321 | 2323 | | |
2322 | 2324 | | |
2323 | | - | |
2324 | | - | |
2325 | | - | |
| 2325 | + | |
| 2326 | + | |
| 2327 | + | |
| 2328 | + | |
| 2329 | + | |
2326 | 2330 | | |
2327 | 2331 | | |
2328 | 2332 | | |
2329 | | - | |
| 2333 | + | |
2330 | 2334 | | |
| 2335 | + | |
2331 | 2336 | | |
2332 | 2337 | | |
2333 | 2338 | | |
| |||
2417 | 2422 | | |
2418 | 2423 | | |
2419 | 2424 | | |
| 2425 | + | |
2420 | 2426 | | |
2421 | | - | |
| 2427 | + | |
2422 | 2428 | | |
2423 | 2429 | | |
2424 | 2430 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1682 | 1682 | | |
1683 | 1683 | | |
1684 | 1684 | | |
1685 | | - | |
1686 | | - | |
1687 | | - | |
| 1685 | + | |
| 1686 | + | |
| 1687 | + | |
| 1688 | + | |
| 1689 | + | |
1688 | 1690 | | |
1689 | 1691 | | |
1690 | 1692 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
| 68 | + | |
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
109 | | - | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
110 | 116 | | |
111 | 117 | | |
112 | 118 | | |
| |||
119 | 125 | | |
120 | 126 | | |
121 | 127 | | |
122 | | - | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
123 | 135 | | |
124 | 136 | | |
125 | 137 | | |
| |||
129 | 141 | | |
130 | 142 | | |
131 | 143 | | |
132 | | - | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
133 | 151 | | |
134 | 152 | | |
135 | 153 | | |
| |||
143 | 161 | | |
144 | 162 | | |
145 | 163 | | |
146 | | - | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
147 | 171 | | |
148 | 172 | | |
149 | 173 | | |
| |||
157 | 181 | | |
158 | 182 | | |
159 | 183 | | |
160 | | - | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
161 | 191 | | |
162 | 192 | | |
163 | 193 | | |
| |||
167 | 197 | | |
168 | 198 | | |
169 | 199 | | |
170 | | - | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
171 | 207 | | |
172 | 208 | | |
173 | 209 | | |
| |||
184 | 220 | | |
185 | 221 | | |
186 | 222 | | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
0 commit comments