fix

Signed-off-by: Jiang, Zhiwei <zhiwei.jiang@intel.com>

Author: zhiweij1

clang/lib/DPCT/RuleInfra/ExprAnalysis.cpp

@@ -25,6 +25,7 @@
 #include "clang/AST/StmtCXX.h"
 #include "clang/AST/TypeLoc.h"
 #include "llvm/Support/raw_ostream.h"
+#include <optional>
 
 extern clang::tooling::UnifiedPath DpctInstallPath;
 namespace clang {
@@ -552,9 +553,16 @@ void ExprAnalysis::analyzeExpr(const DeclRefExpr *DRE) {
     RefString = DRE->getNameInfo().getAsString();
   }
   if (auto TemplateDecl = dyn_cast<NonTypeTemplateParmDecl>(DRE->getDecl()))
-    if (ConstExprExpanding) {
-      addReplacement(0 /*FIXME*/, TemplateDecl->getNameAsString(),
-                     TemplateDecl->getIndex());
+    if (ConstExprExpansionInfo) {
+      auto Loc = ConstExprExpansionInfo.value().first.find(
+          TemplateDecl->getNameAsString());
+      // TODO: more than 1 substrings matched
+      if (Loc != std::string::npos) {
+        // Offset is relative to the final migrated string
+        addReplacement(Loc + ConstExprExpansionInfo.value().second,
+                       TemplateDecl->getNameAsString(),
+                       TemplateDecl->getIndex());
+      }
     } else
       addReplacement(DRE, TemplateDecl->getIndex());
   else if (const auto *VD = dyn_cast<VarDecl>(DRE->getDecl());
@@ -569,9 +577,9 @@ void ExprAnalysis::analyzeExpr(const DeclRefExpr *DRE) {
       // TODO: more than 1 substrings matched
       if (Loc != std::string::npos) {
         addReplacement(Loc, VDStr.size(), VDInitStr);
-        ConstExprExpanding = true;
+        ConstExprExpansionInfo = std::make_pair(VDInitStr, Loc);
         dispatch(VD->getInit());
-        ConstExprExpanding = false;
+        ConstExprExpansionInfo = std::nullopt;
       }
     }
   } else if (auto ECD = dyn_cast<EnumConstantDecl>(DRE->getDecl())) {

clang/lib/DPCT/RuleInfra/ExprAnalysis.h

@@ -719,7 +719,9 @@ class ExprAnalysis {
   std::string RewritePrefix;
   std::string RewritePostfix;
   std::set<HelperFeatureEnum> HelperFeatureSet;
-  bool ConstExprExpanding = false;
+  std::optional<std::pair<std::string /*constexpr definitaion*/,
+                          unsigned /*constexpr offset in original str*/>>
+      ConstExprExpansionInfo = std::nullopt;
 
 public:
   bool IsAnalyzingCtTypeInfo = false;

clang/test/dpct/sharedmem_var_static.cu

@@ -229,11 +229,11 @@ void fooh() {
 constexpr int kWarpSize = 32;
 
 template <int ThreadsPerBlock, int NumWarpQ> __global__ void kerfunc() {
-  constexpr int kNumWarps = ThreadsPerBlock / kWarpSize;
+  constexpr int kNumWarps = (2 * ThreadsPerBlock / kWarpSize);
   __shared__ int smem[kNumWarps * NumWarpQ];
 }
 
 void foo2() {
-  // CHECK: sycl::local_accessor<int, 1> smem_acc_ct1(sycl::range<1>(128 / kWarpSize * 8), cgh);
+  // CHECK: sycl::local_accessor<int, 1> smem_acc_ct1(sycl::range<1>((2 * 128 / kWarpSize) * 8), cgh);
   kerfunc<128, 8><<<32, 32>>>();
 }