[SYCL] Improve SYCLPropagateAspectsUsage pass (#7035)

Pass should also collect & propagate function's aspects defined by
"!sycl_used_aspect" metadata

Author: KornevNikita

llvm/lib/SYCLLowerIR/SYCLPropagateAspectsUsage.cpp

@@ -285,6 +285,7 @@ void propagateAspectsThroughCG(Function *F, CallGraphTy &CG,
 ///  - checks if return and argument types are using any aspects
 ///  - checks if instructions are using any aspects
 ///  - updates call graph information
+///  - checks if function has "!sycl_used_aspects" metadata
 ///
 void processFunction(Function &F, FunctionToAspectsMapTy &FunctionToAspects,
                      TypeToAspectsMapTy &TypesWithAspects, CallGraphTy &CG) {
@@ -307,6 +308,17 @@ void processFunction(Function &F, FunctionToAspectsMapTy &FunctionToAspects,
         CG[&F].insert(CI->getCalledFunction());
     }
   }
+
+  if (F.hasMetadata("sycl_used_aspects")) {
+    const MDNode *MD = F.getMetadata("sycl_used_aspects");
+    AspectsSetTy Aspects;
+    for (size_t I = 0, E = MD->getNumOperands(); I < E; ++I) {
+      Constant *C =
+        cast<ConstantAsMetadata>(MD->getOperand(I).get())->getValue();
+      Aspects.insert(cast<ConstantInt>(C)->getSExtValue());
+    }
+    FunctionToAspects[&F].insert(Aspects.begin(), Aspects.end());
+  }
 }
 
 // Return true if the function is a SPIRV or SYCL builtin, e.g.

llvm/test/SYCLLowerIR/PropagateAspectsUsage/PropagateFunctionWithSyclDetailAspect/propagate-aspects-from-function-with-sycl-detail-1.ll

@@ -0,0 +1,48 @@
+; RUN: opt -passes=sycl-propagate-aspects-usage %s -S | FileCheck %s
+
+; Check that baz() & bar() take the same !sycl_used_aspects as foo()
+
+; baz()
+;  |
+;  v
+; bar()
+;  |
+;  v
+; foo()
+
+source_filename = "main.cpp"
+target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"
+target triple = "spir64-unknown-unknown"
+
+; CHECK: void @_ZTSZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_EUlvE_() !sycl_used_aspects ![[#ASPECT:]] {
+define weak_odr dso_local spir_kernel void @_ZTSZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_EUlvE_() {
+entry:
+  call spir_func void @_Z3bazv()
+  ret void
+}
+
+; CHECK: void @_Z3bazv() !sycl_used_aspects ![[#ASPECT]] {
+define dso_local spir_func void @_Z3bazv() {
+entry:
+  call spir_func void @_Z3barv()
+  ret void
+}
+
+; CHECK: void @_Z3barv() !sycl_used_aspects ![[#ASPECT]] {
+define dso_local spir_func void @_Z3barv() {
+entry:
+  call spir_func void @_Z3foov()
+  ret void
+}
+
+; CHECK: void @_Z3foov() !sycl_used_aspects ![[#ASPECT]] {
+define dso_local spir_func void @_Z3foov() !sycl_used_aspects !2 {
+entry:
+  ret void
+}
+
+!sycl_aspects = !{!0, !1}
+
+!0 = !{!"gpu", i32 2}
+!1 = !{!"fp64", i32 6}
+!2 = !{i32 2}

llvm/test/SYCLLowerIR/PropagateAspectsUsage/PropagateFunctionWithSyclDetailAspect/propagate-aspects-from-function-with-sycl-detail-2.ll

@@ -0,0 +1,44 @@
+; RUN: opt -passes=sycl-propagate-aspects-usage %s -S | FileCheck %s
+
+; Check that baz() takes a mix of "!sycl_used_aspects" of bar() & foo()
+
+;    baz()
+;   /     \
+;  v       v
+; bar()   foo()
+
+source_filename = "main.cpp"
+target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"
+target triple = "spir64-unknown-unknown"
+
+; CHECK: void @_Z3bazv() !sycl_used_aspects ![[#ASPECT1:]] {
+define dso_local spir_kernel void @_Z3bazv() {
+entry:
+  call spir_func void @_Z3barv()
+  call spir_func void @_Z3foov()
+  ret void
+}
+
+; CHECK: void @_Z3barv() !sycl_used_aspects ![[#ASPECT2:]] {
+define dso_local spir_func void @_Z3barv() !sycl_used_aspects !3 {
+entry:
+  ret void
+}
+
+; CHECK: void @_Z3foov() !sycl_used_aspects ![[#ASPECT3:]] {
+define dso_local spir_func void @_Z3foov() !sycl_used_aspects !4 {
+entry:
+  ret void
+}
+
+; CHECK: ![[#ASPECT1]] = !{i32 2, i32 1}
+; CHECK: ![[#ASPECT2]] = !{i32 2}
+; CHECK: ![[#ASPECT3]] = !{i32 1}
+
+!sycl_aspects = !{!0, !1, !2}
+
+!0 = !{!"cpu", i32 1}
+!1 = !{!"gpu", i32 2}
+!2 = !{!"fp64", i32 6}
+!3 = !{i32 2}
+!4 = !{i32 1}

llvm/test/SYCLLowerIR/PropagateAspectsUsage/PropagateFunctionWithSyclDetailAspect/propagate-aspects-from-function-with-sycl-detail-3.ll

@@ -0,0 +1,62 @@
+; RUN: opt -passes=sycl-propagate-aspects-usage < %s -S | FileCheck %s
+
+; Test checks that the pass is able to propagate information about used aspects
+; & aspects from function's "!sycl_used_aspects" through a call graph
+;
+;   K
+;  /  \
+; F1  F2
+;  \  / \
+;   F3   F4
+;
+; F3 uses optional A.
+; F4 uses optional B.
+
+%Optional.A = type { i32 }
+%Optional.B = type { i32 }
+
+; CHECK: spir_kernel void @kernel() !sycl_used_aspects ![[#ID1:]] {
+define spir_kernel void @kernel() {
+  call spir_func void @func1()
+  call spir_func void @func2()
+  ret void
+}
+
+; CHECK: spir_func void @func1() !sycl_used_aspects ![[#ID2:]] {
+define spir_func void @func1() {
+  call spir_func void @func3()
+  ret void
+}
+
+; CHECK: spir_func void @func2() !sycl_used_aspects ![[#ID1]] {
+define spir_func void @func2() {
+  call spir_func void @func3()
+  call spir_func void @func4()
+  ret void
+}
+
+; CHECK: spir_func void @func3() !sycl_used_aspects ![[#ID2]] {
+define spir_func void @func3() {
+  %tmp = alloca %Optional.A
+  ret void
+}
+
+; CHECK: spir_func void @func4() !sycl_used_aspects ![[#ID3:]] {
+define spir_func void @func4() !sycl_used_aspects !5 {
+  %tmp = alloca %Optional.B
+  ret void
+}
+
+!sycl_types_that_use_aspects = !{!0, !1}
+!0 = !{!"Optional.A", i32 1}
+!1 = !{!"Optional.B", i32 2}
+
+!sycl_aspects = !{!2}
+!2 = !{!"fp64", i32 6}
+!3 = !{!"cpu", i32 1}
+!4 = !{!"host", i32 0}
+!5 = !{i32 0}
+
+; CHECK: ![[#ID1]] = !{i32 1, i32 2, i32 0}
+; CHECK: ![[#ID2]] = !{i32 1}
+; CHECK: ![[#ID3]] = !{i32 2, i32 0}