[SYCL] Disable dead arg elimination for free function kernels

llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp

@@ -575,6 +575,17 @@ void DeadArgumentEliminationPass::surveyFunction(const Function &F) {
     return;
   }
 
+  // Do not modify arguments when the SYCL kernel is a free function kernel.
+  // In this case, the user sets the arguments of the kernel by themselves
+  // and dead argument elimination may interfere with their expectations.
+  bool FuncIsSyclFreeFunctionKernel =
+      F.hasFnAttribute("sycl-single-task-kernel") ||
+      F.hasFnAttribute("sycl-nd-range-kernel");
+  if (FuncIsSyclFreeFunctionKernel) {
+    markFrozen(F);
+    return;
+  }
+
   LLVM_DEBUG(
       dbgs() << "DeadArgumentEliminationPass - Inspecting callers for fn: "
              << F.getName() << "\n");

llvm/test/Transforms/DeadArgElim/sycl-kernels-neg.ll

@@ -24,7 +24,30 @@ define weak_odr void @NotASpirKernel(float %arg1, float %arg2) {
 
 define weak_odr void @ESIMDKernel(float %arg1, float %arg2) !sycl_explicit_simd !0 {
 ; CHECK-LABEL: define {{[^@]+}}@ESIMDKernel
-; CHECK-SAME: (float [[ARG1:%.*]], float [[ARG2:%.*]]) !sycl_explicit_simd !0 {
+; CHECK-SAME: (float [[ARG1:%.*]], float [[ARG2:%.*]]) {{.*}}{
+; CHECK-NEXT:    call void @foo(float [[ARG1]])
+; CHECK-NEXT:    ret void
+;
+  call void @foo(float %arg1)
+  ret void
+}
+
+; The following two tests ensure that dead arguments are not eliminated
+; from a free function kernel.
+
+define weak_odr spir_kernel void @FreeFuncKernelSingleTask(float %arg1, float %arg2) "sycl-single-task-kernel"="0" {
+; CHECK-LABEL: define {{[^@]+}}@FreeFuncKernelSingleTask
+; CHECK-SAME: (float [[ARG1:%.*]], float [[ARG2:%.*]]) #[[ATTR0:[0-9]+]] {
+; CHECK-NEXT:    call void @foo(float [[ARG1]])
+; CHECK-NEXT:    ret void
+;
+  call void @foo(float %arg1)
+  ret void
+}
+
+define weak_odr spir_kernel void @FreeFuncKernelNdRange(float %arg1, float %arg2) "sycl-nd-range-kernel"="0" {
+; CHECK-LABEL: define {{[^@]+}}@FreeFuncKernelNdRange
+; CHECK-SAME: (float [[ARG1:%.*]], float [[ARG2:%.*]]) #[[ATTR1:[0-9]+]] {
 ; CHECK-NEXT:    call void @foo(float [[ARG1]])
 ; CHECK-NEXT:    ret void
 ;
@@ -34,4 +57,5 @@ define weak_odr void @ESIMDKernel(float %arg1, float %arg2) !sycl_explicit_simd
 
 declare void @foo(float %arg)
 
+
 !0 = !{}

sycl/test-e2e/FreeFunctionKernels/template_specialization.cpp

@@ -93,18 +93,6 @@ void F<float>(int X) {
   volatile float Y = static_cast<float>(X);
 }
 
-template <typename... Args>
-SYCL_EXT_ONEAPI_FUNCTION_PROPERTY(
-    (ext::oneapi::experimental::single_task_kernel))
-void variadic_templated(Args... args) {}
-
-template <>
-SYCL_EXT_ONEAPI_FUNCTION_PROPERTY(
-    (ext::oneapi::experimental::single_task_kernel))
-void variadic_templated<double>(double b) {
-  b = 20.0f;
-}
-
 template <auto *Func, typename T> void test_func() {
   queue Q;
   kernel_bundle bundle =
@@ -173,7 +161,6 @@ int main() {
   test_func_custom_type<A::B::C::TestClass>();
   test_func<F<float>, float>();
   test_func<F<uint32_t>, uint32_t>();
-  test_func<variadic_templated<double>, double>();
   test_func<sum1<3, float>, float>();
   test_accessor();
   test_shared();