diff --git a/IGC/Compiler/CISACodeGen/GenIRLowering.cpp b/IGC/Compiler/CISACodeGen/GenIRLowering.cpp
index 83b82f26c..9d17ec8b7 100644
--- a/IGC/Compiler/CISACodeGen/GenIRLowering.cpp
+++ b/IGC/Compiler/CISACodeGen/GenIRLowering.cpp
@@ -335,6 +335,9 @@ bool GenIRLowering::runOnFunction(Function &F) {
       } else if (CallInst *CI = dyn_cast<CallInst>(Inst)) {
         CI->replaceUsesOfWith(V, NewBase);
         Changed = true;
+      } else if (CmpInst *CI = dyn_cast<CmpInst>(Inst)) {
+        CI->replaceUsesOfWith(V, NewBase);
+        Changed = true;
       }
     }
   }