SYCLITT -> SPIRITT

Signed-off-by: Dmitry Sidorov <dmitry.sidorov@intel.com>

Author: MrSidims

.github/CODEOWNERS

@@ -114,3 +114,8 @@ SYCLLowerIR/ @kbobrovs @DenisBakhvalov
 esimd/ @kbobrovs @DenisBakhvalov
 sycl/include/CL/sycl/INTEL/esimd.hpp @kbobrovs @DenisBakhvalov
 sycl/doc/extensions/ExplicitSIMD/ @kbobrovs
+
+# ITT annotations
+llvm/lib/Transforms/Instrumentation/SPIRITTAnnotations.cpp @MrSidims
+llvm/include/llvm/Transforms/Instrumentation/SPIRITTAnnotations.h @MrSidims
+

clang/include/clang/Basic/CodeGenOptions.def

@@ -417,8 +417,8 @@ CODEGENOPT(PassByValueIsNoAlias, 1, 0)
 /// according to the field declaring type width.
 CODEGENOPT(AAPCSBitfieldWidth, 1, 1)
 
-// Whether to instrument SYCL device code with ITT annotations
-CODEGENOPT(SYCLITTAnnotations, 1, 0)
+// Whether to instrument SPIR device code with ITT annotations
+CODEGENOPT(SPIRITTAnnotations, 1, 0)
 
 #undef CODEGENOPT
 #undef ENUM_CODEGENOPT

clang/include/clang/Driver/Options.td

@@ -2421,7 +2421,7 @@ def fno_sycl_device_code_lower_esimd : Flag<["-"], "fno-sycl-device-code-lower-e
 def fsycl_instrument_device_code : Flag<["-"], "fsycl-instrument-device-code">,
   Group<f_Group>, Flags<[CC1Option, CoreOption]>,
   HelpText<"Add ITT instrumentation intrinsics calls">,
-  MarshallingInfoFlag<CodeGenOpts<"SYCLITTAnnotations">>;
+  MarshallingInfoFlag<CodeGenOpts<"SPIRITTAnnotations">>;
 defm sycl_id_queries_fit_in_int: OptInFFlag<"sycl-id-queries-fit-in-int", "Assume", "Do not assume", " that SYCL ID queries fit within MAX_INT.", [CC1Option,CoreOption], LangOpts<"SYCLValueFitInMaxInt">>;
 def fsycl_use_bitcode : Flag<["-"], "fsycl-use-bitcode">,
   Flags<[CC1Option, CoreOption]>, HelpText<"Use LLVM bitcode instead of SPIR-V in fat objects">;

clang/lib/CodeGen/BackendUtil.cpp

@@ -72,7 +72,7 @@
 #include "llvm/Transforms/Instrumentation/InstrProfiling.h"
 #include "llvm/Transforms/Instrumentation/MemProfiler.h"
 #include "llvm/Transforms/Instrumentation/MemorySanitizer.h"
-#include "llvm/Transforms/Instrumentation/SYCLITTAnnotations.h"
+#include "llvm/Transforms/Instrumentation/SPIRITTAnnotations.h"
 #include "llvm/Transforms/Instrumentation/SanitizerCoverage.h"
 #include "llvm/Transforms/Instrumentation/ThreadSanitizer.h"
 #include "llvm/Transforms/ObjCARC.h"
@@ -949,14 +949,14 @@ void EmitAssemblyHelper::EmitAssembly(BackendAction Action,
       LangOpts.EnableDAEInSpirKernels)
     PerModulePasses.add(createDeadArgEliminationSYCLPass());
 
-  // Add SYCLITTAnnotations pass to the pass manager if
+  // Add SPIRITTAnnotations pass to the pass manager if
   // -fsycl-instrument-device-code option was passed. This option can be
   // used only with spir tripple.
-  if (CodeGenOpts.SYCLITTAnnotations) {
+  if (CodeGenOpts.SPIRITTAnnotations) {
     if (!llvm::Triple(TheModule->getTargetTriple()).isSPIR())
       llvm::report_fatal_error(
           "ITT annotations can only by added to a module with spir target");
-    PerModulePasses.add(createSYCLITTAnnotationsPass());
+    PerModulePasses.add(createSPIRITTAnnotationsPass());
   }
 
   switch (Action) {

clang/test/Driver/sycl-instrumentation.c

@@ -1,4 +1,4 @@
-/// Check that SYCL ITT instrumentation is disabled by default:
+/// Check that SPIR ITT instrumentation is disabled by default:
 // RUN: %clang -### %s 2>&1 \
 // RUN: | FileCheck -check-prefix=CHECK-DEFAULT %s
 // CHECK-DEFAULT-NOT: "-fsycl-instrument-device-code"

llvm/include/llvm/InitializePasses.h

@@ -429,7 +429,7 @@ void initializeStripSymbolsPass(PassRegistry&);
 void initializeStructurizeCFGLegacyPassPass(PassRegistry &);
 void initializeSYCLLowerWGScopeLegacyPassPass(PassRegistry &);
 void initializeSYCLLowerESIMDLegacyPassPass(PassRegistry &);
-void initializeSYCLITTAnnotationsLegacyPassPass(PassRegistry &);
+void initializeSPIRITTAnnotationsLegacyPassPass(PassRegistry &);
 void initializeESIMDLowerLoadStorePass(PassRegistry &);
 void initializeESIMDLowerVecArgLegacyPassPass(PassRegistry &);
 void initializeTailCallElimPass(PassRegistry&);

llvm/include/llvm/LinkAllPasses.h

@@ -48,7 +48,7 @@
 #include "llvm/Transforms/InstCombine/InstCombine.h"
 #include "llvm/Transforms/Instrumentation.h"
 #include "llvm/Transforms/Instrumentation/BoundsChecking.h"
-#include "llvm/Transforms/Instrumentation/SYCLITTAnnotations.h"
+#include "llvm/Transforms/Instrumentation/SPIRITTAnnotations.h"
 #include "llvm/Transforms/ObjCARC.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Scalar/GVN.h"
@@ -205,7 +205,7 @@ namespace {
       (void)llvm::createSYCLLowerESIMDPass();
       (void)llvm::createESIMDLowerLoadStorePass();
       (void)llvm::createESIMDLowerVecArgPass();
-      (void)llvm::createSYCLITTAnnotationsPass();
+      (void)llvm::createSPIRITTAnnotationsPass();
       std::string buf;
       llvm::raw_string_ostream os(buf);
       (void) llvm::createPrintModulePass(os);

llvm/include/llvm/Transforms/Instrumentation/SYCLITTAnnotations.h renamed to llvm/include/llvm/Transforms/Instrumentation/SPIRITTAnnotations.h

@@ -1,4 +1,4 @@
-//===----- SYCLITTAnnotations.h - SYCL Instrumental Annotations Pass ------===//
+//===----- SPIRITTAnnotations.h - SYCL Instrumental Annotations Pass ------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 //
 // A transformation pass which adds instrumental calls to annotate SYCL
-// synchronization instrucations. This can be used for kernel profiling.
+// synchronization instructions. This can be used for kernel profiling.
 //===----------------------------------------------------------------------===//
 
 #pragma once
@@ -17,11 +17,11 @@
 
 namespace llvm {
 
-class SYCLITTAnnotationsPass : public PassInfoMixin<SYCLITTAnnotationsPass> {
+class SPIRITTAnnotationsPass : public PassInfoMixin<SPIRITTAnnotationsPass> {
 public:
   PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
 };
 
-ModulePass *createSYCLITTAnnotationsPass();
+ModulePass *createSPIRITTAnnotationsPass();
 
 } // namespace llvm

llvm/lib/Transforms/Instrumentation/CMakeLists.txt

@@ -15,7 +15,7 @@ add_llvm_component_library(LLVMInstrumentation
   PGOMemOPSizeOpt.cpp
   PoisonChecking.cpp
   SanitizerCoverage.cpp
-  SYCLITTAnnotations.cpp
+  SPIRITTAnnotations.cpp
   ValueProfileCollector.cpp
   ThreadSanitizer.cpp
   HWAddressSanitizer.cpp

llvm/lib/Transforms/Instrumentation/SYCLITTAnnotations.cpp renamed to llvm/lib/Transforms/Instrumentation/SPIRITTAnnotations.cpp

@@ -1,4 +1,4 @@
-//===---- SYCLITTAnnotations.cpp - SYCL Instrumental Annotations Pass -----===//
+//===---- SPIRITTAnnotations.cpp - SYCL Instrumental Annotations Pass -----===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,7 +10,7 @@
 // synchronization instructions. This can be used for kernel profiling.
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Transforms/Instrumentation/SYCLITTAnnotations.h"
+#include "llvm/Transforms/Instrumentation/SPIRITTAnnotations.h"
 
 #include "llvm/IR/Function.h"
 #include "llvm/IR/InstIterator.h"
@@ -19,7 +19,7 @@
 #include "llvm/IR/Type.h"
 #include "llvm/InitializePasses.h"
 
-/** Following instrumentations will be linked from libdevice:
+/** Following functions are used for ITT instrumentation:
  * * * * * * * * * * *
  * Notify tools work-item execution has started
  *
@@ -106,41 +106,41 @@ constexpr char ITT_ANNOTATION_ATOMIC_FINISH[] =
     "__itt_offload_atomic_op_finish";
 
 // Wrapper for the pass to make it working with the old pass manager
-class SYCLITTAnnotationsLegacyPass : public ModulePass {
+class SPIRITTAnnotationsLegacyPass : public ModulePass {
 public:
   static char ID;
-  SYCLITTAnnotationsLegacyPass() : ModulePass(ID) {
-    initializeSYCLITTAnnotationsLegacyPassPass(
+  SPIRITTAnnotationsLegacyPass() : ModulePass(ID) {
+    initializeSPIRITTAnnotationsLegacyPassPass(
         *PassRegistry::getPassRegistry());
   }
 
-  // run the SYCLITTAnnotations pass on the specified module
+  // run the SPIRITTAnnotations pass on the specified module
   bool runOnModule(Module &M) override {
     ModuleAnalysisManager MAM;
     auto PA = Impl.run(M, MAM);
     return !PA.areAllPreserved();
   }
 
 private:
-  SYCLITTAnnotationsPass Impl;
+  SPIRITTAnnotationsPass Impl;
 };
 
 } // namespace
 
-char SYCLITTAnnotationsLegacyPass::ID = 0;
-INITIALIZE_PASS(SYCLITTAnnotationsLegacyPass, "SYCLITTAnnotations",
+char SPIRITTAnnotationsLegacyPass::ID = 0;
+INITIALIZE_PASS(SPIRITTAnnotationsLegacyPass, "SPIRITTAnnotations",
                 "Insert ITT annotations in SYCL code", false, false)
 
-// Public interface to the SYCLITTAnnotationsPass.
-ModulePass *llvm::createSYCLITTAnnotationsPass() {
-  return new SYCLITTAnnotationsLegacyPass();
+// Public interface to the SPIRITTAnnotationsPass.
+ModulePass *llvm::createSPIRITTAnnotationsPass() {
+  return new SPIRITTAnnotationsLegacyPass();
 }
 
 namespace {
 
 // Check for calling convention of a function. If it's spir_kernel - consider
 // the function to be a SYCL kernel.
-bool isSyclKernel(Function &F) {
+bool isSPIRKernel(Function &F) {
   return F.getCallingConv() == CallingConv::SPIR_KERNEL;
 }
 
@@ -231,7 +231,7 @@ bool insertAtomicInstrumentationCall(Module &M, StringRef Name,
 
 } // namespace
 
-PreservedAnalyses SYCLITTAnnotationsPass::run(Module &M,
+PreservedAnalyses SPIRITTAnnotationsPass::run(Module &M,
                                               ModuleAnalysisManager &MAM) {
   bool IRModified = false;
   std::vector<StringRef> SPIRVCrossWGInstuctions = {
@@ -242,7 +242,7 @@ PreservedAnalyses SYCLITTAnnotationsPass::run(Module &M,
 
   for (Function &F : M) {
     // Annotate only SYCL kernels
-    if (F.isDeclaration() || !isSyclKernel(F))
+    if (F.isDeclaration() || !isSPIRKernel(F))
       continue;
 
     // At the beggining of a kernel insert work item start annotation

llvm/test/Transforms/SYCLITTAnnotations/itt_atomic_load.ll renamed to llvm/test/Transforms/SPIRITTAnnotations/itt_atomic_load.ll

@@ -1,11 +1,11 @@
 ;; The test serves a purpose to check if Atomic load instruction is being
-;; annotated by SYCLITTAnnotations pass
+;; annotated by SPIRITTAnnotations pass
 ;;
 ;; Compiled from https://github.com/intel/llvm-test-suite/blob/intel/SYCL/AtomicRef/load.cpp
 ;; with following commands:
 ;; clang++ -fsycl -fsycl-device-only load.cpp -o load.bc
 
-; RUN: opt < %s --SYCLITTAnnotations -S | FileCheck %s
+; RUN: opt < %s --SPIRITTAnnotations -S | FileCheck %s
 
 ; ModuleID = 'load.bc'
 source_filename = "llvm-test-suite/SYCL/AtomicRef/load.cpp"

llvm/test/Transforms/SYCLITTAnnotations/itt_atomic_store.ll renamed to llvm/test/Transforms/SPIRITTAnnotations/itt_atomic_store.ll

@@ -1,11 +1,11 @@
 ;; The test serves a purpose to check if Atomic store instruction is being
-;; annotated by SYCLITTAnnotations pass
+;; annotated by SPIRITTAnnotations pass
 ;;
 ;; Compiled from https://github.com/intel/llvm-test-suite/blob/intel/SYCL/AtomicRef/load.cpp
 ;; with following commands:
 ;; clang++ -fsycl -fsycl-device-only load.cpp -o load.bc
 
-; RUN: opt < %s --SYCLITTAnnotations -S | FileCheck %s
+; RUN: opt < %s --SPIRITTAnnotations -S | FileCheck %s
 
 ; ModuleID = 'store.bc'
 source_filename = "llvm-test-suite/SYCL/AtomicRef/store.cpp"

llvm/test/Transforms/SYCLITTAnnotations/itt_barrier.ll renamed to llvm/test/Transforms/SPIRITTAnnotations/itt_barrier.ll

@@ -1,11 +1,11 @@
 ;; The test serves a purpose to check if barrier instruction is being annotated
-;; by SYCLITTAnnotations pass
+;; by SPIRITTAnnotations pass
 ;;
 ;; Compiled from https://github.com/intel/llvm-test-suite/blob/intel/SYCL/KernelAndProgram/kernel-and-program.cpp
 ;; with following commands:
 ;; clang++ -fsycl -fsycl-device-only kernel-and-program.cpp -o kernel_and_program_optimized.bc
 
-; RUN: opt < %s --SYCLITTAnnotations -S | FileCheck %s
+; RUN: opt < %s --SPIRITTAnnotations -S | FileCheck %s
 
 ; ModuleID = 'kernel_and_program_optimized.bc'
 source_filename = "llvm-link"

llvm/test/Transforms/SYCLITTAnnotations/itt_start_finish.ll renamed to llvm/test/Transforms/SPIRITTAnnotations/itt_start_finish.ll

@@ -1,7 +1,7 @@
 ;; The test serves a purpose to check if work item start/finish annotations
-;; are being added by SYCLITTAnnotations pass
+;; are being added by SPIRITTAnnotations pass
 
-; RUN: opt < %s --SYCLITTAnnotations -S | FileCheck %s
+; RUN: opt < %s --SPIRITTAnnotations -S | FileCheck %s
 
 ; ModuleID = 'synthetic.bc'
 source_filename = "synthetic.cpp"

llvm/tools/opt/opt.cpp

@@ -582,7 +582,7 @@ int main(int argc, char **argv) {
   initializeReplaceWithVeclibLegacyPass(Registry);
   initializeSYCLLowerWGScopeLegacyPassPass(Registry);
   initializeSYCLLowerESIMDLegacyPassPass(Registry);
-  initializeSYCLITTAnnotationsLegacyPassPass(Registry);
+  initializeSPIRITTAnnotationsLegacyPassPass(Registry);
   initializeESIMDLowerLoadStorePass(Registry);
   initializeESIMDLowerVecArgLegacyPassPass(Registry);