Address feedbacks

Naghasan · Naghasan · commit 69b87cb89a83 · 2025-03-10T11:04:23.000Z
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
@@ -7183,7 +7183,6 @@ defm sycl_allow_device_image_dependencies: BoolOptionWithoutMarshalling<"f", "sy
 def fsycl_dump_device_code_EQ : Joined<["-"], "fsycl-dump-device-code=">,
   Flags<[NoXarchOption]>,
   HelpText<"Dump device code into the user provided directory.">;
-
 } // let Group = sycl_Group
 
 // FIXME: -fsycl-explicit-simd is deprecated. remove it when support is dropped.
@@ -8752,11 +8751,9 @@ def fsycl_allow_func_ptr_EQ : Joined<["-"], "fsycl-allow-func-ptr=">,
            "Default is 'off'">;
 def fsycl_allow_func_ptr : Flag<["-"], "fsycl-allow-func-ptr">,
   Alias<fsycl_allow_func_ptr_EQ>, AliasArgs<["labeled"]>,
-  Visibility<[ClangOption, CLOption, CC1Option]>,
   HelpText<"Same as -fsycl-allow-func-ptr=labeled.">;
 def fno_sycl_allow_func_ptr : Flag<["-"], "fno-sycl-allow-func-ptr">,
   Alias<fsycl_allow_func_ptr_EQ>, AliasArgs<["off"]>,
-  Visibility<[ClangOption, CLOption, CC1Option]>,
   HelpText<"Same as -fsycl-allow-func-ptr=off.">;
 def fenable_sycl_dae : Flag<["-"], "fenable-sycl-dae">,
   HelpText<"Enable Dead Argument Elimination in SPIR kernels">,
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -5672,9 +5672,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
         }
       }
 
-      if (Arg *A = Args.getLastArg(options::OPT_fsycl_allow_func_ptr_EQ))
-        A->render(Args, CmdArgs);
-
       Args.AddLastArg(CmdArgs, options::OPT_fsycl_decompose_functor,
                       options::OPT_fno_sycl_decompose_functor);
 
diff --git a/clang/test/CodeGenSYCL/invoke-function-defined.cpp b/clang/test/CodeGenSYCL/invoke-function-defined.cpp
@@ -9,24 +9,34 @@ using namespace sycl;
 queue q;
 
 int bar10() { return 10; }
+[[intel::device_indirectly_callable]] int bar20() { return 20; }
 
-// CHECK: define linkonce_odr spir_func noundef i32 @{{.*}}invoke_function{{.*}}(ptr noundef nonnull %f)
 template <typename Callable>
 auto invoke_function(Callable &&f) {
-  // CHECK: %f.addr = alloca ptr, align 8
-  // CHECK: %f.addr.ascast = addrspacecast ptr %f.addr to ptr addrspace(4)
-  // CHECK: store ptr %f, ptr addrspace(4) %f.addr.ascast, align 8
-  // CHECK: %0 = load ptr, ptr addrspace(4) %f.addr.ascast, align 8
-  // CHECK: %call = call spir_func noundef i32 %0()
   return f();
 }
 
-// CHECK: define linkonce_odr spir_func noundef i32 @{{.*}}bar10{{.*}}()
-
 int main() {
   kernel_single_task<class KernelName>(
       [=]() {
         invoke_function(bar10);
+        invoke_function(bar20);
       });
   return 0;
 }
+
+// CHECK: define dso_local spir_func noundef i32 @{{.*}}bar20{{.*}}()
+
+// CHECK: @_ZZ4mainENKUlvE_clEv
+// CHECK: call {{.*}}invoke_function{{.*}}(ptr noundef nonnull @_Z5bar10v)
+// CHECK: call {{.*}}invoke_function{{.*}}(ptr noundef nonnull @_Z5bar20v)
+
+// CHECK: define linkonce_odr spir_func noundef i32 @{{.*}}invoke_function{{.*}}(ptr noundef nonnull %f)
+// CHECK: %f.addr = alloca ptr, align 8
+// CHECK: %f.addr.ascast = addrspacecast ptr %f.addr to ptr addrspace(4)
+// CHECK: store ptr %f, ptr addrspace(4) %f.addr.ascast, align 8
+// CHECK: %0 = load ptr, ptr addrspace(4) %f.addr.ascast, align 8
+// CHECK: %call = call spir_func noundef i32 %0()
+
+
+// CHECK: define linkonce_odr spir_func noundef i32 @{{.*}}bar10{{.*}}()
diff --git a/clang/test/SemaSYCL/address-taken-of-defined-func.cpp b/clang/test/SemaSYCL/address-taken-of-defined-func.cpp
@@ -0,0 +1,19 @@
+// RUN: %clang_cc1 -fsycl-is-device -fsycl-allow-func-ptr=defined -internal-isystem %S/Inputs -fsyntax-only -verify -sycl-std=2020 -std=c++17 %s
+
+#include "sycl.hpp"
+
+template <typename T> SYCL_EXTERNAL void foo(T input);
+
+template <>
+void foo(int input) {}
+template <>
+void foo(double input);
+
+SYCL_EXTERNAL void usage() {
+  auto FP = &foo<int>;
+  auto FP1 = &foo<char>; // expected-error {{taking address of a function without a definition and not marked with 'intel::device_indirectly_callable'}}
+  auto FP2 = &foo<double>;
+}
+
+template <>
+void foo(double input) {}
diff --git a/clang/test/SemaSYCL/constexpr-function-pointer.cpp b/clang/test/SemaSYCL/constexpr-function-pointer.cpp
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -fsycl-is-device -fsyntax-only -verify -sycl-std=2020 -std=c++17 %s
-// RUN: %clang_cc1 -fsycl-is-device -fsycl-allow-func-ptr=off -fsyntax-only -verify -sycl-std=2020 -std=c++17 %s
+// RUN: %clang_cc1 -fsycl-is-device -fsyntax-only -verify -sycl-std=2020 %s
+// RUN: %clang_cc1 -fsycl-is-device -fsycl-allow-func-ptr=off -fsyntax-only -verify -sycl-std=2020 %s
 
 // This test checks that the compiler doesn't emit an error when indirect call
 // was made through a function pointer that is constant expression, and makes
diff --git a/clang/test/SemaSYCL/wrong-address-taking.cpp b/clang/test/SemaSYCL/wrong-address-taking.cpp
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -fsycl-is-device -fsycl-allow-func-ptr=labeled -internal-isystem %S/Inputs -fsyntax-only -verify -sycl-std=2020 -std=c++17 %s
-// RUN: %clang_cc1 -fsycl-is-device -fsycl-allow-func-ptr=defined -internal-isystem %S/Inputs -fsyntax-only -verify=defined-func -sycl-std=2020 -std=c++17 %s
+// RUN: %clang_cc1 -fsycl-is-device -fsycl-allow-func-ptr=labeled -internal-isystem %S/Inputs -fsyntax-only -verify -sycl-std=2020 %s
+// RUN: %clang_cc1 -fsycl-is-device -fsycl-allow-func-ptr=defined -internal-isystem %S/Inputs -fsyntax-only -verify=defined-func -sycl-std=2020 %s
 
 #include "sycl.hpp"
 

Original file line number	Diff line number	Diff line change
`@@ -5672,9 +5672,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,`
`5672`	`5672`	`}`
`5673`	`5673`	`}`
`5674`	`5674`
`5675`		`- if (Arg *A = Args.getLastArg(options::OPT_fsycl_allow_func_ptr_EQ))`
`5676`		`- A->render(Args, CmdArgs);`
`5677`		`-`
`5678`	`5675`	`Args.AddLastArg(CmdArgs, options::OPT_fsycl_decompose_functor,`
`5679`	`5676`	`options::OPT_fno_sycl_decompose_functor);`
`5680`	`5677`