Add more tests, clean SemaSYCL

Author: Fznamznon

clang/lib/Sema/SemaSYCL.cpp

@@ -6464,14 +6464,14 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
 
     O << "\n";
     O << "// Forward declarations of kernel and its argument types:\n";
-    Policy.SuppressDefaultTemplateArgs = false;
     FwdDeclEmitter.Visit(K.SyclKernel->getType());
     O << "\n";
 
     if (K.SyclKernel->getLanguageLinkage() == CLanguageLinkage)
       O << "extern \"C\" ";
     std::string ParmList;
     bool FirstParam = true;
+    Policy.SuppressDefaultTemplateArgs = false;
     for (ParmVarDecl *Param : K.SyclKernel->parameters()) {
       if (FirstParam)
         FirstParam = false;
@@ -6482,9 +6482,21 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
     FunctionTemplateDecl *FTD = K.SyclKernel->getPrimaryTemplate();
     Policy.SuppressDefinition = true;
     Policy.PolishForDeclaration = true;
-    Policy.EnforceDefaultTemplateArgs = true;
     Policy.FullyQualifiedName = true;
     Policy.EnforceScopeForElaboratedTypes = true;
+
+    // SuppressDefaultTemplateArguments is a downstream addition that suppresses
+    // default template arguments in function declarations. It should be set to
+    // true to emit function declaration that won't cause any compilation errors
+    // when present in the integration header.
+    // SuppressDefaultTemplateArgs is a flag from community code which adds
+    // suppression of template arguments that match default template arguments
+    // in template-ids printing.
+    Policy.SuppressDefaultTemplateArguments = true;
+    // EnforceDefaultTemplateArgs is a downstream addition that forces printing
+    // template arguments that match default template arguments while printing
+    // template-ids, even if the source code doesn't referece them.
+    Policy.EnforceDefaultTemplateArgs = true;
     if (FTD) {
       FTD->print(O, Policy);
     } else {
@@ -6513,10 +6525,6 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
     }
     O << ";\n";
     O << "}\n";
-    Policy.SuppressDefaultTemplateArgs = true;
-    Policy.EnforceDefaultTemplateArgs = false;
-    Policy.FullyQualifiedName = false;
-    Policy.EnforceScopeForElaboratedTypes = false;
 
     // Generate is_kernel, is_single_task_kernel and nd_range_kernel functions.
     O << "namespace sycl {\n";

clang/test/CodeGenSYCL/free_function_default_template_arguments.cpp

@@ -1,8 +1,8 @@
 // RUN: %clang_cc1 -fsycl-is-device -internal-isystem %S/Inputs -triple spir64-unknown-unknown -sycl-std=2020 -fsycl-int-header=%t.h %s
 // RUN: FileCheck -input-file=%t.h %s
 
-// This test checks integration header contents free functions kernels in
-// presense of template arguments.
+// This test checks integration header contents for free functions kernels with
+// parameter types that have default template arguments.
 
 #include "mock_properties.hpp"
 #include "sycl.hpp"
@@ -13,6 +13,13 @@ struct notatuple {
   int a;
 };
 
+namespace ns1 {
+template <typename A = notatuple>
+class hasDefaultArg {
+
+};
+}
+
 template <typename T, typename = int, int a = 12, typename = notatuple, typename ...TS> struct Arg {
   T val;
 };
@@ -24,6 +31,11 @@ simple(Arg<char>){
 
 }
 
+[[__sycl_detail__::add_ir_attributes_function("sycl-single-task-kernel",
+                                              2)]] void
+simple1(ns::Arg<ns::ns1::hasDefaultArg<>>){
+}
+
 
 template <typename T>
 [[__sycl_detail__::add_ir_attributes_function("sycl-nd-range-kernel", 2)]] void
@@ -41,7 +53,12 @@ templated2(Arg<T, notatuple>, T end) {
 
 template void templated2(Arg<int, notatuple>, int);
 
-// CHECK: Definition of _ZN16__sycl_kernel_ns6simpleENS_3ArgIciLi12ENS_9notatupleEJEEE as a free function kernel
+template <typename T, int a = 3>
+[[__sycl_detail__::add_ir_attributes_function("sycl-nd-range-kernel", 2)]] void
+templated3(Arg<T, notatuple, a, ns1::hasDefaultArg<>, int, int>, T end) {
+}
+
+template void templated3(Arg<int, notatuple, 3, ns1::hasDefaultArg<>, int, int>, int);
 
 // CHECK: Forward declarations of kernel and its argument types:
 // CHECK-NEXT: namespace ns { 
@@ -56,15 +73,28 @@ template void templated2(Arg<int, notatuple>, int);
 // CHECK-NEXT:   return (void (*)(struct ns::Arg<char, int, 12, struct ns::notatuple>))simple;
 // CHECK-NEXT: }
 
-// CHECK: Definition of _Z23__sycl_kernel_templatedIiEvN2ns3ArgIT_fLi3ENS0_9notatupleEJEEES2_ as a free function kernel
-// CHECK: template <typename T> void templated(ns::Arg<T, float, 3, ns::notatuple>, T end);
+// CHECK: Forward declarations of kernel and its argument types:
+// CHECK: namespace ns {
+// CHECK: namespace ns1 {
+// CHECK-NEXT: template <typename A> class hasDefaultArg;
+// CHECK-NEXT: }
+
+// CHECK: void simple1(ns::Arg<ns::ns1::hasDefaultArg<ns::notatuple>, int, 12, ns::notatuple>);
 // CHECK-NEXT: static constexpr auto __sycl_shim2() {
+// CHECK-NEXT:   return (void (*)(struct ns::Arg<class ns::ns1::hasDefaultArg<struct ns::notatuple>, int, 12, struct ns::notatuple>))simple1;
+// CHECK-NEXT: }
+
+// CHECK: template <typename T> void templated(ns::Arg<T, float, 3, ns::notatuple>, T end);
+// CHECK-NEXT: static constexpr auto __sycl_shim3() {
 // CHECK-NEXT:   return (void (*)(struct ns::Arg<int, float, 3, struct ns::notatuple>, int))templated<int>;
 // CHECK-NEXT: }
 
-// CHECK: Definition of _Z24__sycl_kernel_templated2IiEvN2ns3ArgIT_NS0_9notatupleELi12ES3_JEEES2_ as a free function kernel
-// CHECK: Forward declarations of kernel and its argument types:
 // CHECK: template <typename T> void templated2(ns::Arg<T, ns::notatuple, 12, ns::notatuple>, T end);
-// CHECK-NEXT: static constexpr auto __sycl_shim3() {
+// CHECK-NEXT: static constexpr auto __sycl_shim4() {
 // CHECK-NEXT:   return (void (*)(struct ns::Arg<int, struct ns::notatuple, 12, struct ns::notatuple>, int))templated2<int>;
 // CHECK-NEXT: }
+
+// CHECK: template <typename T, int a> void templated3(ns::Arg<T, ns::notatuple, a, ns::ns1::hasDefaultArg<ns::notatuple>, int, int>, T end);
+// CHECK-NEXT: static constexpr auto __sycl_shim5() {
+// CHECK-NEXT:   return (void (*)(struct ns::Arg<int, struct ns::notatuple, 3, class ns::ns1::hasDefaultArg<struct ns::notatuple>, int, int>, int))templated3<int, 3>;
+// CHECK-NEXT: }