Change name to integration footer

Author: Erich Keane

clang/include/clang/Basic/LangOptions.h

@@ -350,8 +350,8 @@ class LangOptions : public LangOptionsBase {
   /// SYCL integration header to be generated by the device compiler
   std::string SYCLIntHeader;
 
-  /// SYCL post integration header to be generated by the device compiler
-  std::string SYCLPostIntHeader;
+  /// SYCL integration footer to be generated by the device compiler
+  std::string SYCLIntFooter;
 
   LangOptions();
 

clang/include/clang/Driver/Options.td

@@ -5685,11 +5685,11 @@ def fsycl_int_header : Separate<["-"], "fsycl-int-header">,
   MarshallingInfoString<LangOpts<"SYCLIntHeader">>;
 def fsycl_int_header_EQ : Joined<["-"], "fsycl-int-header=">,
   Alias<fsycl_int_header>;
-def fsycl_post_int_header : Separate<["-"], "fsycl-post-int-header">,
-  HelpText<"Generate SYCL post integration header into this file.">,
-  MarshallingInfoString<LangOpts<"SYCLPostIntHeader">>;
-def fsycl_post_int_header_EQ : Joined<["-"], "fsycl-post-int-header=">,
-  Alias<fsycl_post_int_header>;
+def fsycl_int_footer : Separate<["-"], "fsycl-int-footer">,
+  HelpText<"Generate SYCL integration footer into this file.">,
+  MarshallingInfoString<LangOpts<"SYCLIntFooter">>;
+def fsycl_int_footer_EQ : Joined<["-"], "fsycl-int-footer=">,
+  Alias<fsycl_int_footer>;
 def fsycl_std_layout_kernel_params: Flag<["-"], "fsycl-std-layout-kernel-params">,
   HelpText<"Enable standard layout requirement for SYCL kernel parameters.">,
   MarshallingInfoFlag<LangOpts<"SYCLStdLayoutKernelParams">>;

clang/include/clang/Sema/Sema.h

@@ -430,9 +430,9 @@ class SYCLIntegrationHeader {
   Sema &S;
 };
 
-class SYCLPostIntegrationHeader {
+class SYCLIntegrationFooter {
 public:
-  SYCLPostIntegrationHeader(Sema &S) : S(S) {}
+  SYCLIntegrationFooter(Sema &S) : S(S) {}
   bool emit(StringRef MainSrc);
 
 private:
@@ -13119,7 +13119,7 @@ class Sema final {
   // SYCL integration header instance for current compilation unit this Sema
   // is associated with.
   std::unique_ptr<SYCLIntegrationHeader> SyclIntHeader;
-  std::unique_ptr<SYCLPostIntegrationHeader> SyclPostIntHeader;
+  std::unique_ptr<SYCLIntegrationFooter> SyclIntFooter;
 
   // Used to suppress diagnostics during kernel construction, since these were
   // already emitted earlier. Diagnosing during Kernel emissions also skips the
@@ -13138,10 +13138,10 @@ class Sema final {
     return *SyclIntHeader.get();
   }
 
-  SYCLPostIntegrationHeader &getSyclPostIntegrationHeader() {
-    if (SyclPostIntHeader == nullptr)
-      SyclPostIntHeader = std::make_unique<SYCLPostIntegrationHeader>(*this);
-    return *SyclPostIntHeader.get();
+  SYCLIntegrationFooter &getSyclIntegrationFooter() {
+    if (SyclIntFooter == nullptr)
+      SyclIntFooter = std::make_unique<SYCLIntegrationFooter>(*this);
+    return *SyclIntFooter.get();
   }
 
   enum SYCLRestrictKind {

clang/lib/Frontend/CompilerInvocation.cpp

@@ -4390,7 +4390,7 @@ bool CompilerInvocation::CreateFromArgsImpl(
     Res.getTargetOpts().HostTriple = Res.getFrontendOpts().AuxTriple;
     // If specified, create empty integration header files for now.
     CreateEmptyFile(LangOpts.SYCLIntHeader);
-    CreateEmptyFile(LangOpts.SYCLPostIntHeader);
+    CreateEmptyFile(LangOpts.SYCLIntFooter);
   }
 
   Success &= ParseCodeGenArgs(Res.getCodeGenOpts(), Args, DashX, Diags, T,

clang/lib/Sema/Sema.cpp

@@ -183,7 +183,7 @@ Sema::Sema(Preprocessor &pp, ASTContext &ctxt, ASTConsumer &consumer,
       DisableTypoCorrection(false), TyposCorrected(0), AnalysisWarnings(*this),
       ThreadSafetyDeclCache(nullptr), VarDataSharingAttributesStack(nullptr),
       CurScope(nullptr), Ident_super(nullptr), Ident___float128(nullptr),
-      SyclIntHeader(nullptr), SyclPostIntHeader(nullptr) {
+      SyclIntHeader(nullptr), SyclIntFooter(nullptr) {
   TUScope = nullptr;
   isConstantEvaluatedOverride = false;
 
@@ -1037,8 +1037,8 @@ void Sema::ActOnEndOfTranslationUnitFragment(TUFragmentKind Kind) {
     // Emit SYCL integration header for current translation unit if needed
     if (SyclIntHeader != nullptr)
       SyclIntHeader->emit(getLangOpts().SYCLIntHeader);
-    if (SyclPostIntHeader != nullptr)
-      SyclPostIntHeader->emit(getLangOpts().SYCLPostIntHeader);
+    if (SyclIntFooter != nullptr)
+      SyclIntFooter->emit(getLangOpts().SYCLIntFooter);
     MarkDevice();
   }
 

clang/lib/Sema/SemaSYCL.cpp

@@ -3086,12 +3086,12 @@ class SyclKernelIntHeaderCreator : public SyclKernelFieldHandler {
   using SyclKernelFieldHandler::leaveStruct;
 };
 
-class SyclKernelPostIntHeaderCreator : public SyclKernelFieldHandler {
-  SYCLPostIntegrationHeader &Header;
+class SyclKernelIntFooterCreator : public SyclKernelFieldHandler {
+  SYCLIntegrationFooter &Footer;
 
 public:
-  SyclKernelPostIntHeaderCreator(Sema &S, SYCLPostIntegrationHeader &H)
-      : SyclKernelFieldHandler(S), Header(H) {}
+  SyclKernelIntFooterCreator(Sema &S, SYCLIntegrationFooter &F)
+      : SyclKernelFieldHandler(S), Footer(F) {}
 };
 
 } // namespace
@@ -3419,14 +3419,13 @@ void Sema::ConstructOpenCLKernel(FunctionDecl *KernelCallerFunc,
       calculateKernelNameType(Context, KernelCallerFunc), KernelName,
       StableName, KernelCallerFunc);
 
-  SyclKernelPostIntHeaderCreator post_int_header(
-      *this, getSyclPostIntegrationHeader());
+  SyclKernelIntFooterCreator int_footer(*this, getSyclIntegrationFooter());
 
   KernelObjVisitor Visitor{*this};
   Visitor.VisitRecordBases(KernelObj, kernel_decl, kernel_body, int_header,
-                           post_int_header);
+                           int_footer);
   Visitor.VisitRecordFields(KernelObj, kernel_decl, kernel_body, int_header,
-                            post_int_header);
+                            int_footer);
 
   if (ParmVarDecl *KernelHandlerArg =
           getSyclKernelHandlerArg(KernelCallerFunc)) {
@@ -4239,7 +4238,7 @@ SYCLIntegrationHeader::SYCLIntegrationHeader(bool _UnnamedLambdaSupport,
     : UnnamedLambdaSupport(_UnnamedLambdaSupport), S(_S) {}
 
 // Post-compile integration header support.
-bool SYCLPostIntegrationHeader::emit(StringRef IntHeaderName) {
+bool SYCLIntegrationFooter::emit(StringRef IntHeaderName) {
   if (IntHeaderName.empty())
     return false;
   int IntHeaderFD = 0;
@@ -4254,8 +4253,8 @@ bool SYCLPostIntegrationHeader::emit(StringRef IntHeaderName) {
   return emit(Out);
 }
 
-bool SYCLPostIntegrationHeader::emit(raw_ostream &O) {
-  O << "// Post Integration Header contents to go here.\n";
+bool SYCLIntegrationFooter::emit(raw_ostream &O) {
+  O << "// Integration Footer contents to go here.\n";
   return true;
 }
 

clang/test/CodeGenSYCL/post_integration_header.cpp renamed to clang/test/CodeGenSYCL/integration_footer.cpp

@@ -1,10 +1,10 @@
-// RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown-sycldevice -fsycl-post-int-header=%t.h %s -emit-llvm -o %t.ll
+// RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown-sycldevice -fsycl-int_footer=%t.h %s -emit-llvm -o %t.ll
 // RUN: FileCheck -input-file=%t.h %s
 
-// CHECK: // Post Integration Header contents to go here.
+// CHECK: // Integration Footer contents to go here.
 
 #include "Inputs/sycl.hpp"
 
-int main() {
+nt main() {
   cl::sycl::kernel_single_task<class first_kernel>([]() {});
 }