Skip to content

Commit 04c54fb

Browse files
steffenlarsensteffenlarsen
authored
[SYCL] Rename optional device feature metadata (#6822)
This commit renames metadata nodes introduced by the optional device features design document from using `intel_` prefix to use `sycl_` prefix. Signed-off-by: Larsen, Steffen <[email protected]>
1 parent c81f957 commit 04c54fb

File tree

12 files changed

+91
-92
lines changed

12 files changed

+91
-92
lines changed

‎clang/lib/CodeGen/CodeGenFunction.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ void CodeGenFunction::StartFunction(GlobalDecl GD, QualType RetTy,
10731073
AspectsMD.push_back(llvm::ConstantAsMetadata::get(
10741074
Builder.getInt32(AspectInt.getZExtValue())));
10751075
}
1076-
Fn->setMetadata("intel_declared_aspects",
1076+
Fn->setMetadata("sycl_declared_aspects",
10771077
llvm::MDNode::get(getLLVMContext(), AspectsMD));
10781078
}
10791079
if (const auto *A = D->getAttr<SYCLUsesAspectsAttr>()) {
@@ -1083,7 +1083,7 @@ void CodeGenFunction::StartFunction(GlobalDecl GD, QualType RetTy,
10831083
AspectsMD.push_back(llvm::ConstantAsMetadata::get(
10841084
Builder.getInt32(AspectInt.getZExtValue())));
10851085
}
1086-
Fn->setMetadata("intel_used_aspects",
1086+
Fn->setMetadata("sycl_used_aspects",
10871087
llvm::MDNode::get(getLLVMContext(), AspectsMD));
10881088
}
10891089
}

‎clang/lib/CodeGen/CodeGenModule.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ void CodeGenModule::Release() {
915915
// Emit type name with list of associated device aspects.
916916
if (TypesWithAspects.size() > 0) {
917917
llvm::NamedMDNode *AspectsMD =
918-
TheModule.getOrInsertNamedMetadata("intel_types_that_use_aspects");
918+
TheModule.getOrInsertNamedMetadata("sycl_types_that_use_aspects");
919919
for (const auto &Type : TypesWithAspects) {
920920
StringRef Name = Type.first;
921921
const RecordDecl *RD = Type.second;

‎clang/test/CodeGenSYCL/device_has.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@
66
using namespace sycl;
77
queue q;
88

9-
// CHECK: define dso_local spir_kernel void @{{.*}}kernel_name_1{{.*}} !intel_declared_aspects ![[ASPECTS1:[0-9]+]]
9+
// CHECK: define dso_local spir_kernel void @{{.*}}kernel_name_1{{.*}} !sycl_declared_aspects ![[ASPECTS1:[0-9]+]]
1010

11-
// CHECK: define dso_local spir_func void @{{.*}}func1{{.*}} !intel_declared_aspects ![[ASPECTS1]] {
11+
// CHECK: define dso_local spir_func void @{{.*}}func1{{.*}} !sycl_declared_aspects ![[ASPECTS1]] {
1212
[[sycl::device_has(sycl::aspect::cpu)]] void func1() {}
1313

14-
// CHECK: define dso_local spir_func void @{{.*}}func2{{.*}} !intel_declared_aspects ![[ASPECTS2:[0-9]+]] {
14+
// CHECK: define dso_local spir_func void @{{.*}}func2{{.*}} !sycl_declared_aspects ![[ASPECTS2:[0-9]+]] {
1515
[[sycl::device_has(sycl::aspect::fp16, sycl::aspect::gpu)]] void func2() {}
1616

17-
// CHECK: define dso_local spir_func void @{{.*}}func3{{.*}} !intel_declared_aspects ![[EMPTYASPECTS:[0-9]+]] {
17+
// CHECK: define dso_local spir_func void @{{.*}}func3{{.*}} !sycl_declared_aspects ![[EMPTYASPECTS:[0-9]+]] {
1818
[[sycl::device_has()]] void func3() {}
1919

20-
// CHECK: define linkonce_odr spir_func void @{{.*}}func4{{.*}} !intel_declared_aspects ![[ASPECTS3:[0-9]+]] {
20+
// CHECK: define linkonce_odr spir_func void @{{.*}}func4{{.*}} !sycl_declared_aspects ![[ASPECTS3:[0-9]+]] {
2121
template <sycl::aspect Aspect>
2222
[[sycl::device_has(Aspect)]] void func4() {}
2323

24-
// CHECK: define dso_local spir_func void @{{.*}}func5{{.*}} !intel_declared_aspects ![[ASPECTS1]] {
24+
// CHECK: define dso_local spir_func void @{{.*}}func5{{.*}} !sycl_declared_aspects ![[ASPECTS1]] {
2525
[[sycl::device_has(sycl::aspect::cpu)]] void func5();
2626
void func5() {}
2727

2828
constexpr sycl::aspect getAspect() { return sycl::aspect::cpu; }
29-
// CHECK: define dso_local spir_func void @{{.*}}func6{{.*}} !intel_declared_aspects ![[ASPECTS1]] {
29+
// CHECK: define dso_local spir_func void @{{.*}}func6{{.*}} !sycl_declared_aspects ![[ASPECTS1]] {
3030
[[sycl::device_has(getAspect())]] void func6() {}
3131

3232
class KernelFunctor {
@@ -45,7 +45,7 @@ void foo() {
4545
q.submit([&](handler &h) {
4646
KernelFunctor f1;
4747
h.single_task<class kernel_name_1>(f1);
48-
// CHECK: define dso_local spir_kernel void @{{.*}}kernel_name_2{{.*}} !intel_declared_aspects ![[ASPECTS4:[0-9]+]]
48+
// CHECK: define dso_local spir_kernel void @{{.*}}kernel_name_2{{.*}} !sycl_declared_aspects ![[ASPECTS4:[0-9]+]]
4949
h.single_task<class kernel_name_2>([]() [[sycl::device_has(sycl::aspect::gpu)]] {});
5050
});
5151
}

‎clang/test/CodeGenSYCL/uses_aspects.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,32 @@ class [[__sycl_detail__::__uses_aspects__(sycl::aspect::cpu)]] Type1WithAspect{}
1010
class [[__sycl_detail__::__uses_aspects__(sycl::aspect::fp16, sycl::aspect::cpu)]] Type2WithAspect{};
1111
class [[__sycl_detail__::__uses_aspects__(sycl::aspect::host)]] UnusedType3WithAspect{};
1212

13-
// CHECK: define dso_local spir_func void @{{.*}}func1{{.*}} !intel_used_aspects ![[ASPECTS1:[0-9]+]] {
13+
// CHECK: define dso_local spir_func void @{{.*}}func1{{.*}} !sycl_used_aspects ![[ASPECTS1:[0-9]+]] {
1414
[[__sycl_detail__::__uses_aspects__(sycl::aspect::cpu)]] void func1() {}
1515

16-
// CHECK: define dso_local spir_func void @{{.*}}func2{{.*}} !intel_used_aspects ![[ASPECTS2:[0-9]+]] {
16+
// CHECK: define dso_local spir_func void @{{.*}}func2{{.*}} !sycl_used_aspects ![[ASPECTS2:[0-9]+]] {
1717
[[__sycl_detail__::__uses_aspects__(sycl::aspect::fp16, sycl::aspect::gpu)]] void func2() {}
1818

19-
// CHECK: define dso_local spir_func void @{{.*}}func3{{.*}} !intel_used_aspects ![[EMPTYASPECTS:[0-9]+]] {
19+
// CHECK: define dso_local spir_func void @{{.*}}func3{{.*}} !sycl_used_aspects ![[EMPTYASPECTS:[0-9]+]] {
2020
[[__sycl_detail__::__uses_aspects__()]] void func3() {}
2121

22-
// CHECK: define linkonce_odr spir_func void @{{.*}}func4{{.*}} !intel_used_aspects ![[ASPECTS3:[0-9]+]] {
22+
// CHECK: define linkonce_odr spir_func void @{{.*}}func4{{.*}} !sycl_used_aspects ![[ASPECTS3:[0-9]+]] {
2323
template <sycl::aspect Aspect>
2424
[[__sycl_detail__::__uses_aspects__(Aspect)]] void func4() {}
2525

26-
// CHECK: define dso_local spir_func void @{{.*}}func5{{.*}} !intel_used_aspects ![[ASPECTS1]] {
26+
// CHECK: define dso_local spir_func void @{{.*}}func5{{.*}} !sycl_used_aspects ![[ASPECTS1]] {
2727
[[__sycl_detail__::__uses_aspects__(sycl::aspect::cpu)]] void func5();
2828
void func5() {}
2929

3030
[[__sycl_detail__::__uses_aspects__(sycl::aspect::cpu)]] void func6();
31-
// CHECK: define dso_local spir_func void @{{.*}}func6{{.*}} !intel_used_aspects ![[ASPECTS1]] {
31+
// CHECK: define dso_local spir_func void @{{.*}}func6{{.*}} !sycl_used_aspects ![[ASPECTS1]] {
3232
void func6() {
3333
Type1WithAspect TestObj1;
3434
Type2WithAspect TestObj2;
3535
}
3636

3737
constexpr sycl::aspect getAspect() { return sycl::aspect::cpu; }
38-
// CHECK: define dso_local spir_func void @{{.*}}func7{{.*}} !intel_used_aspects ![[ASPECTS1]] {
38+
// CHECK: define dso_local spir_func void @{{.*}}func7{{.*}} !sycl_used_aspects ![[ASPECTS1]] {
3939
[[__sycl_detail__::__uses_aspects__(getAspect())]] void func7() {}
4040

4141
class KernelFunctor {
@@ -57,7 +57,7 @@ void foo() {
5757
h.single_task<class kernel_name_1>(f1);
5858
});
5959
}
60-
// CHECK: !intel_types_that_use_aspects = !{![[TYPE1:[0-9]+]], ![[TYPE2:[0-9]+]]}
60+
// CHECK: !sycl_types_that_use_aspects = !{![[TYPE1:[0-9]+]], ![[TYPE2:[0-9]+]]}
6161
// CHECK: [[TYPE1]] = !{!"class.Type1WithAspect", i32 1}
6262
// CHECK: [[TYPE2]] = !{!"class.Type2WithAspect", i32 5, i32 1}
6363
// CHECK: [[EMPTYASPECTS]] = !{}

‎llvm/lib/SYCLLowerIR/SYCLPropagateAspectsUsage.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ namespace {
4949
using AspectsSetTy = SmallSet<int, 4>;
5050
using TypeToAspectsMapTy = std::unordered_map<const Type *, AspectsSetTy>;
5151

52-
/// Retrieves from metadata (intel_types_that_use_aspects) types
52+
/// Retrieves from metadata (sycl_types_that_use_aspects) types
5353
/// and aspects these types depend on.
5454
TypeToAspectsMapTy getTypesThatUseAspectsFromMetadata(const Module &M) {
55-
const NamedMDNode *Node = M.getNamedMetadata("intel_types_that_use_aspects");
55+
const NamedMDNode *Node = M.getNamedMetadata("sycl_types_that_use_aspects");
5656
TypeToAspectsMapTy Result;
5757
if (!Node)
5858
return Result;
@@ -225,7 +225,7 @@ void createUsedAspectsMetadataForFunctions(FunctionToAspectsMapTy &Map) {
225225
ConstantInt::getSigned(Type::getInt32Ty(C), A)));
226226

227227
MDNode *MDN = MDNode::get(C, AspectsMetadata);
228-
F->setMetadata("intel_used_aspects", MDN);
228+
F->setMetadata("sycl_used_aspects", MDN);
229229
}
230230
}
231231

‎llvm/test/SYCLLowerIR/PropagateAspectsUsage/call-graph-1.ll

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
%Optional.A = type { i32 }
1515
%Optional.B = type { i32 }
1616

17-
; CHECK: spir_kernel void @kernel1() !intel_used_aspects ![[#ID1:]] {
17+
; CHECK: spir_kernel void @kernel1() !sycl_used_aspects ![[#ID1:]] {
1818
define spir_kernel void @kernel1() {
1919
call spir_func void @func1()
2020
call spir_func void @func2()
2121
ret void
2222
}
2323

24-
; CHECK: spir_kernel void @kernel2() !intel_used_aspects ![[#ID2:]] {
24+
; CHECK: spir_kernel void @kernel2() !sycl_used_aspects ![[#ID2:]] {
2525
define spir_kernel void @kernel2() {
2626
call spir_func void @func2()
2727
call spir_func void @func3()
@@ -34,19 +34,19 @@ define spir_func void @func1() {
3434
ret void
3535
}
3636

37-
; CHECK: spir_func void @func2() !intel_used_aspects ![[#ID1]] {
37+
; CHECK: spir_func void @func2() !sycl_used_aspects ![[#ID1]] {
3838
define spir_func void @func2() {
3939
%tmp = alloca %Optional.A
4040
ret void
4141
}
4242

43-
; CHECK: spir_func void @func3() !intel_used_aspects ![[#ID3:]] {
43+
; CHECK: spir_func void @func3() !sycl_used_aspects ![[#ID3:]] {
4444
define spir_func void @func3() {
4545
%tmp = alloca %Optional.B
4646
ret void
4747
}
4848

49-
!intel_types_that_use_aspects = !{!0, !1}
49+
!sycl_types_that_use_aspects = !{!0, !1}
5050
!0 = !{!"Optional.A", i32 1}
5151
!1 = !{!"Optional.B", i32 2}
5252

‎llvm/test/SYCLLowerIR/PropagateAspectsUsage/call-graph-2.ll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,39 +15,39 @@
1515
%Optional.A = type { i32 }
1616
%Optional.B = type { i32 }
1717

18-
; CHECK: spir_kernel void @kernel() !intel_used_aspects ![[#ID1:]] {
18+
; CHECK: spir_kernel void @kernel() !sycl_used_aspects ![[#ID1:]] {
1919
define spir_kernel void @kernel() {
2020
call spir_func void @func1()
2121
call spir_func void @func2()
2222
ret void
2323
}
2424

25-
; CHECK: spir_func void @func1() !intel_used_aspects ![[#ID2:]] {
25+
; CHECK: spir_func void @func1() !sycl_used_aspects ![[#ID2:]] {
2626
define spir_func void @func1() {
2727
call spir_func void @func3()
2828
ret void
2929
}
3030

31-
; CHECK: spir_func void @func2() !intel_used_aspects ![[#ID1]] {
31+
; CHECK: spir_func void @func2() !sycl_used_aspects ![[#ID1]] {
3232
define spir_func void @func2() {
3333
call spir_func void @func3()
3434
call spir_func void @func4()
3535
ret void
3636
}
3737

38-
; CHECK: spir_func void @func3() !intel_used_aspects ![[#ID2]] {
38+
; CHECK: spir_func void @func3() !sycl_used_aspects ![[#ID2]] {
3939
define spir_func void @func3() {
4040
%tmp = alloca %Optional.A
4141
ret void
4242
}
4343

44-
; CHECK: spir_func void @func4() !intel_used_aspects ![[#ID3:]] {
44+
; CHECK: spir_func void @func4() !sycl_used_aspects ![[#ID3:]] {
4545
define spir_func void @func4() {
4646
%tmp = alloca %Optional.B
4747
ret void
4848
}
4949

50-
!intel_types_that_use_aspects = !{!0, !1}
50+
!sycl_types_that_use_aspects = !{!0, !1}
5151
!0 = !{!"Optional.A", i32 1}
5252
!1 = !{!"Optional.B", i32 2}
5353

‎llvm/test/SYCLLowerIR/PropagateAspectsUsage/composite-types-1.ll

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222

2323
%F2.does.not.contain.optional = type { %B.core, %C.core*, %D2.does.not.contain.optional* }
2424

25-
; CHECK: spir_kernel void @kernelD1.uses.optional() !intel_used_aspects !1 {
25+
; CHECK: spir_kernel void @kernelD1.uses.optional() !sycl_used_aspects !1 {
2626
define spir_kernel void @kernelD1.uses.optional() {
2727
%tmp = alloca %D1.contains.optional
2828
ret void
2929
}
3030

31-
; CHECK: spir_func void @funcD1.uses.optional() !intel_used_aspects !1 {
31+
; CHECK: spir_func void @funcD1.uses.optional() !sycl_used_aspects !1 {
3232
define spir_func void @funcD1.uses.optional() {
3333
%tmp = alloca %D1.contains.optional
3434
ret void
@@ -46,13 +46,13 @@ define spir_func void @funcD2.does.not.use.optional() {
4646
ret void
4747
}
4848

49-
; CHECK: spir_kernel void @kernelE.uses.optional() !intel_used_aspects !1 {
49+
; CHECK: spir_kernel void @kernelE.uses.optional() !sycl_used_aspects !1 {
5050
define spir_kernel void @kernelE.uses.optional() {
5151
%tmp = alloca %E.contains.optional
5252
ret void
5353
}
5454

55-
; CHECK: spir_func void @funcE.uses.optional() !intel_used_aspects !1 {
55+
; CHECK: spir_func void @funcE.uses.optional() !sycl_used_aspects !1 {
5656
define spir_func void @funcE.uses.optional() {
5757
%tmp = alloca %E.contains.optional
5858
ret void
@@ -82,25 +82,25 @@ define spir_func void @funcF2.does.not.use.optional() {
8282
ret void
8383
}
8484

85-
; CHECK: spir_func %A.optional @funcA.returns.optional() !intel_used_aspects !1 {
85+
; CHECK: spir_func %A.optional @funcA.returns.optional() !sycl_used_aspects !1 {
8686
define spir_func %A.optional @funcA.returns.optional() {
8787
%tmp = alloca %A.optional
8888
%ret = load %A.optional, %A.optional* %tmp
8989
ret %A.optional %ret
9090
}
9191

92-
; CHECK: spir_func void @funcA.uses.array.of.optional() !intel_used_aspects !1 {
92+
; CHECK: spir_func void @funcA.uses.array.of.optional() !sycl_used_aspects !1 {
9393
define spir_func void @funcA.uses.array.of.optional() {
9494
%tmp = alloca [4 x %A.optional]
9595
ret void
9696
}
9797

98-
; CHECK: spir_func void @funcA.assepts.optional(%A.optional %0) !intel_used_aspects !1 {
98+
; CHECK: spir_func void @funcA.assepts.optional(%A.optional %0) !sycl_used_aspects !1 {
9999
define spir_func void @funcA.assepts.optional(%A.optional %0) {
100100
ret void
101101
}
102102

103-
!intel_types_that_use_aspects = !{!0}
103+
!sycl_types_that_use_aspects = !{!0}
104104
!0 = !{!"A.optional", i32 1}
105105

106106
; CHECK: !1 = !{i32 1}

‎llvm/test/SYCLLowerIR/PropagateAspectsUsage/double.ll

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,31 @@
44

55
%composite = type { double }
66

7-
; CHECK: spir_kernel void @kernel() !intel_used_aspects !0 {
7+
; CHECK: spir_kernel void @kernel() !sycl_used_aspects !0 {
88
define spir_kernel void @kernel() {
99
call spir_func void @func()
1010
ret void
1111
}
1212

13-
; CHECK: spir_func void @func() !intel_used_aspects !0 {
13+
; CHECK: spir_func void @func() !sycl_used_aspects !0 {
1414
define spir_func void @func() {
1515
%tmp = alloca double
1616
ret void
1717
}
1818

19-
; CHECK: spir_func void @func.array() !intel_used_aspects !0 {
19+
; CHECK: spir_func void @func.array() !sycl_used_aspects !0 {
2020
define spir_func void @func.array() {
2121
%tmp = alloca [4 x double]
2222
ret void
2323
}
2424

25-
; CHECK: spir_func void @func.vector() !intel_used_aspects !0 {
25+
; CHECK: spir_func void @func.vector() !sycl_used_aspects !0 {
2626
define spir_func void @func.vector() {
2727
%tmp = alloca <4 x double>
2828
ret void
2929
}
3030

31-
; CHECK: spir_func void @func.composite() !intel_used_aspects !0 {
31+
; CHECK: spir_func void @func.composite() !sycl_used_aspects !0 {
3232
define spir_func void @func.composite() {
3333
%tmp = alloca %composite
3434
ret void

‎llvm/test/SYCLLowerIR/PropagateAspectsUsage/multiple-aspects.ll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,40 @@
77
%C = type { i32 }
88
%D = type { i32 }
99

10-
; CHECK: define spir_func void @funcA() !intel_used_aspects ![[#ID0:]] {
10+
; CHECK: define spir_func void @funcA() !sycl_used_aspects ![[#ID0:]] {
1111
define spir_func void @funcA() {
1212
%tmp = alloca %A
1313
ret void
1414
}
1515

16-
; CHECK: define spir_func void @funcB() !intel_used_aspects ![[#ID1:]] {
16+
; CHECK: define spir_func void @funcB() !sycl_used_aspects ![[#ID1:]] {
1717
define spir_func void @funcB() {
1818
%tmp = alloca %B
1919
call spir_func void @funcA()
2020
ret void
2121
}
2222

23-
; CHECK: define spir_func void @funcC() !intel_used_aspects ![[#ID2:]] {
23+
; CHECK: define spir_func void @funcC() !sycl_used_aspects ![[#ID2:]] {
2424
define spir_func void @funcC() {
2525
%tmp = alloca %C
2626
call spir_func void @funcB()
2727
ret void
2828
}
2929

30-
; CHECK: define spir_func void @funcD() !intel_used_aspects ![[#ID3:]] {
30+
; CHECK: define spir_func void @funcD() !sycl_used_aspects ![[#ID3:]] {
3131
define spir_func void @funcD() {
3232
%tmp = alloca %D
3333
call spir_func void @funcC()
3434
ret void
3535
}
3636

37-
; CHECK: define spir_kernel void @kernel() !intel_used_aspects ![[#ID3]] {
37+
; CHECK: define spir_kernel void @kernel() !sycl_used_aspects ![[#ID3]] {
3838
define spir_kernel void @kernel() {
3939
call spir_func void @funcD()
4040
ret void
4141
}
4242

43-
!intel_types_that_use_aspects = !{!0, !1, !2, !3}
43+
!sycl_types_that_use_aspects = !{!0, !1, !2, !3}
4444
!0 = !{!"A", i32 0}
4545
!1 = !{!"B", i32 1}
4646
!2 = !{!"C", i32 2}

‎llvm/test/SYCLLowerIR/PropagateAspectsUsage/no-uses-of-optional.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -passes=sycl-propagate-aspects-usage < %s -S | FileCheck %s --implicit-check-not "!intel_used_aspects"
1+
; RUN: opt -passes=sycl-propagate-aspects-usage < %s -S | FileCheck %s --implicit-check-not "!sycl_used_aspects"
22
;
33
; Test checks that no metadata propagates because MyStruct
44
; isn't used inside functions.
@@ -16,5 +16,5 @@ define weak dso_local spir_func void @func() {
1616
ret void
1717
}
1818

19-
!intel_types_that_use_aspects = !{!0}
19+
!sycl_types_that_use_aspects = !{!0}
2020
!0 = !{!"MyStruct", i32 1}

0 commit comments

Comments
 (0)