Apply comments

Author: AlexeySachkov

llvm/tools/sycl-post-link/SpecConstants.cpp

@@ -318,9 +318,6 @@ Instruction *emitSpecConstantComposite(Type *Ty,
 /// first ID. If  \c IsNewSpecConstant is false, this vector is expected to
 /// contain enough elements to assign ID to each scalar element encountered in
 /// the specified composite type.
-/// @param IsNewSpecConstant [in] Flag to specify whether \c IDs vector should
-/// be filled with new IDs or it should be used as-is to replicate an existing
-/// spec constant
 /// @param [in,out] Index Index of scalar element within a composite type
 ///
 /// @returns Instruction* representing specialization constant in LLVM IR, which
@@ -333,7 +330,6 @@ Instruction *emitSpecConstantComposite(Type *Ty,
 /// encountered scalars and assigns them IDs (or re-uses existing ones).
 Instruction *emitSpecConstantRecursiveImpl(Type *Ty, Instruction *InsertBefore,
                                            SmallVectorImpl<unsigned> &IDs,
-                                           bool IsNewSpecConstant,
                                            unsigned &Index) {
   if (!Ty->isArrayTy() && !Ty->isStructTy() && !Ty->isVectorTy()) { // Scalar
     if (Index >= IDs.size()) {
@@ -346,8 +342,8 @@ Instruction *emitSpecConstantRecursiveImpl(Type *Ty, Instruction *InsertBefore,
 
   SmallVector<Instruction *, 8> Elements;
   auto LoopIteration = [&](Type *Ty) {
-    Elements.push_back(emitSpecConstantRecursiveImpl(Ty, InsertBefore, IDs,
-                                                     IsNewSpecConstant, Index));
+    Elements.push_back(
+        emitSpecConstantRecursiveImpl(Ty, InsertBefore, IDs, Index));
   };
 
   if (auto *ArrTy = dyn_cast<ArrayType>(Ty)) {
@@ -371,11 +367,9 @@ Instruction *emitSpecConstantRecursiveImpl(Type *Ty, Instruction *InsertBefore,
 
 /// Wrapper intended to hide IsFirstElement argument from the caller
 Instruction *emitSpecConstantRecursive(Type *Ty, Instruction *InsertBefore,
-                                       SmallVectorImpl<unsigned> &IDs,
-                                       bool IsNewSpecConstant) {
+                                       SmallVectorImpl<unsigned> &IDs) {
   unsigned Index = 0;
-  return emitSpecConstantRecursiveImpl(Ty, InsertBefore, IDs, IsNewSpecConstant,
-                                       Index);
+  return emitSpecConstantRecursiveImpl(Ty, InsertBefore, IDs, Index);
 }
 
 } // namespace
@@ -444,7 +438,7 @@ PreservedAnalyses SpecConstantsPass::run(Module &M,
         //  3. Transform to spirv intrinsic _Z*__spirv_SpecConstant* or
         //  _Z*__spirv_SpecConstantComposite
         auto *SPIRVCall =
-            emitSpecConstantRecursive(SCTy, CI, IDs, IsNewSpecConstant);
+            emitSpecConstantRecursive(SCTy, CI, IDs);
         if (IsNewSpecConstant) {
           // emitSpecConstantRecursive might emit more than one spec constant
           // (because of composite types) and therefore, we need to ajudst

sycl/test/on-device/spec_const/multiple-usages-of-composite.cpp

@@ -6,7 +6,7 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
 //
 // The test checks that multiple usages of the same specialization constant
-// works correctly with: toolchain processes them correctly and runtime can
+// works correctly: toolchain processes them correctly and runtime can
 // correctly execute the program.
 //
 // CHECK: --------> 1
@@ -62,7 +62,8 @@ template <typename T> class kernel_driver_t {
 
 template class kernel_driver_t<float>;
 
-// Uncomment this to trigger the bug.
+// The line below instantiates the second use of the spec constant named
+// `sc_kernel_t`, which used to corrupt the spec constant content
 template class kernel_driver_t<int>;
 } // namespace test