[SYCL] Minor fixes to SYCLConditionalCallOnDevice pass

dm-vodopyanov · dm-vodopyanov · commit 714eb5b4ba3a · 2024-10-29T09:29:49.000-07:00
This patch fixes minor issues in impl and tests for
SYCLConditionalCallOnDevice pass:

- new FCaller function now have attributes from the old one
- fix tests to support RelWithDebInfo and Debug modes
diff --git a/llvm/lib/SYCLLowerIR/SYCLConditionalCallOnDevice.cpp b/llvm/lib/SYCLLowerIR/SYCLConditionalCallOnDevice.cpp
@@ -104,6 +104,7 @@ SYCLConditionalCallOnDevicePass::run(Module &M, ModuleAnalysisManager &) {
                          &M);
 
     NewFCaller->setCallingConv(FCaller->getCallingConv());
+    NewFCaller->setAttributes(FCaller->getAttributes());
 
     DenseMap<CallInst *, CallInst *> OldCallsToNewCalls;
 
diff --git a/llvm/test/SYCLLowerIR/ConditionalCallOnDevice/conditional-call-on-device-1.ll b/llvm/test/SYCLLowerIR/ConditionalCallOnDevice/conditional-call-on-device-1.ll
@@ -28,7 +28,7 @@ entry:
   ret void
 }
 
-; CHECK: declare spir_func void @call_if_on_device_conditionally_PREFIX_1(ptr, ptr, i32, i32)
+; CHECK: declare spir_func void @call_if_on_device_conditionally_PREFIX_1(ptr[[VAL1:.*]], ptr[[VAL2:.*]], i32[[VAL3:.*]], i32[[VAL4:.*]])
 
 attributes #2 = { convergent mustprogress norecurse nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
 attributes #6 = { convergent inlinehint mustprogress norecurse nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
diff --git a/llvm/test/SYCLLowerIR/ConditionalCallOnDevice/conditional-call-on-device-2.ll b/llvm/test/SYCLLowerIR/ConditionalCallOnDevice/conditional-call-on-device-2.ll
@@ -42,8 +42,8 @@ entry:
   ret void
 }
 
-; CHECK: declare spir_func void @call_if_on_device_conditionally1_PREFIX_1(ptr, ptr, i32, i32)
-; CHECK: declare spir_func void @call_if_on_device_conditionally2_PREFIX_2(ptr, ptr, i32, i32)
+; CHECK: declare spir_func void @call_if_on_device_conditionally1_PREFIX_1(ptr[[VAL1:.*]], ptr[[VAL2:.*]], i32[[VAL3:.*]], i32[[VAL4:.*]])
+; CHECK: declare spir_func void @call_if_on_device_conditionally2_PREFIX_2(ptr[[VAL1:.*]], ptr[[VAL2:.*]], i32[[VAL3:.*]], i32[[VAL4:.*]])
 
 attributes #2 = { convergent mustprogress norecurse nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
 attributes #6 = { convergent inlinehint mustprogress norecurse nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ entry:`
`28`	`28`	`ret void`
`29`	`29`	`}`
`30`	`30`
`31`		`-; CHECK: declare spir_func void @call_if_on_device_conditionally_PREFIX_1(ptr, ptr, i32, i32)`
	`31`	`+; CHECK: declare spir_func void @call_if_on_device_conditionally_PREFIX_1(ptr[[VAL1:.]], ptr[[VAL2:.]], i32[[VAL3:.]], i32[[VAL4:.]])`
`32`	`32`
`33`	`33`	`attributes #2 = { convergent mustprogress norecurse nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }`
`34`	`34`	`attributes #6 = { convergent inlinehint mustprogress norecurse nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ entry:`
`42`	`42`	`ret void`
`43`	`43`	`}`
`44`	`44`
`45`		`-; CHECK: declare spir_func void @call_if_on_device_conditionally1_PREFIX_1(ptr, ptr, i32, i32)`
`46`		`-; CHECK: declare spir_func void @call_if_on_device_conditionally2_PREFIX_2(ptr, ptr, i32, i32)`
	`45`	`+; CHECK: declare spir_func void @call_if_on_device_conditionally1_PREFIX_1(ptr[[VAL1:.]], ptr[[VAL2:.]], i32[[VAL3:.]], i32[[VAL4:.]])`
	`46`	`+; CHECK: declare spir_func void @call_if_on_device_conditionally2_PREFIX_2(ptr[[VAL1:.]], ptr[[VAL2:.]], i32[[VAL3:.]], i32[[VAL4:.]])`
`47`	`47`
`48`	`48`	`attributes #2 = { convergent mustprogress norecurse nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }`
`49`	`49`	`attributes #6 = { convergent inlinehint mustprogress norecurse nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" }`