Fix number of elements to use in G4_Declare creation in remat.

Change-Id: Id8b25add97460a950a67df349ad16f5f783c2477

Author: pratikashar

visa/RegAlloc.cpp

@@ -3813,17 +3813,17 @@ int regAlloc(IR_Builder& builder, PhyRegPool& regPool, G4_Kernel& kernel)
         jitInfo->numBytesScratchGtpin = kernel.getGTPinData()->getNumBytesScratchUse();
     }
 
-    if (auto sp = kernel.getVarSplitPass())
-    {
-        sp->replaceIntrinsics();
-    }
-
     recordRAStats(builder, kernel, status);
     if (status != VISA_SUCCESS)
     {
         return status;
     }
 
+    if (auto sp = kernel.getVarSplitPass())
+    {
+        sp->replaceIntrinsics();
+    }
+
     if (builder.getOption(vISA_VerifyRA))
     {
         LivenessAnalysis liveAnalysis(gra,

visa/Rematerialization.cpp

@@ -900,7 +900,7 @@ namespace vISA
                 MUST_BE_TRUE(ops != operations.end(), "Didnt find record in map");
                 MUST_BE_TRUE((*ops).second.numUses == 1, "Expecting src0 to be used only in sampler");
 
-                auto newSrc0Dcl = kernel.fg.builder->createTempVar(src0TopDcl->getNumElems(),
+                auto newSrc0Dcl = kernel.fg.builder->createTempVar(src0TopDcl->getTotalElems(),
                     src0TopDcl->getElemType(), gra.getSubRegAlign(src0TopDcl));
 
                 // Clone all defining instructions for sampler's msg header