Changes in code.

Author: lizhengxing

IGC/Compiler/CISACodeGen/Platform.hpp

@@ -157,6 +157,21 @@ class CPlatform {
   }
 
   bool isPVC() const { return (m_platformInfo.eProductFamily == IGFX_PVC); }
+
+  // Narrowing of bitcasted vector loads (see VectorPreProcess). An explicitly
+  // set EnableBitcastedLoadNarrowing regkey (enable or disable) always takes
+  // precedence.
+  bool enableBitcastedLoadNarrowing() const {
+    return IGC_IS_FLAG_ENABLED(EnableBitcastedLoadNarrowing);
+  }
+
+  // Narrowing of bitcasted vector loads down to a scalar load (see
+  // VectorPreProcess). An explicitly set EnableBitcastedLoadNarrowingToScalar
+  // regkey always takes precedence.
+  bool enableBitcastedLoadNarrowingToScalar() const {
+    return IGC_IS_FLAG_ENABLED(EnableBitcastedLoadNarrowingToScalar);
+  }
+
   bool isCoreXE2() const { return (m_platformInfo.eRenderCoreFamily == IGFX_XE2_HPG_CORE); }
 
   bool isCoreXE3() const {

IGC/Compiler/CISACodeGen/VectorPreProcess.cpp

@@ -1381,7 +1381,7 @@ Instruction *VectorPreProcess::simplifyLoadStore(Instruction *Inst) {
       if (BC) {
         IGCLLVM::FixedVectorType *DstVTy = dyn_cast<IGCLLVM::FixedVectorType>(BC->getType());
         IGCLLVM::FixedVectorType *SrcVTy = dyn_cast<IGCLLVM::FixedVectorType>(BC->getOperand(0)->getType());
-        if (IGC_IS_FLAG_DISABLED(EnableBitcastedLoadNarrowing) || !DstVTy || !SrcVTy ||
+        if (!m_CGCtx->platform.enableBitcastedLoadNarrowing() || !DstVTy || !SrcVTy ||
             DstVTy->getNumElements() != SrcVTy->getNumElements()) {
           BC = nullptr;
         } else {
@@ -1435,7 +1435,7 @@ Instruction *VectorPreProcess::simplifyLoadStore(Instruction *Inst) {
     // as a float).
     // TODO: remove WA when issue is resolved.
     bool skipSimplifyBitcastedOneUse =
-        canSimplifyOneUse && BC && IGC_IS_FLAG_DISABLED(EnableBitcastedLoadNarrowingToScalar);
+        canSimplifyOneUse && BC && !m_CGCtx->platform.enableBitcastedLoadNarrowingToScalar();
 
     auto simplifyLDVecToLDRaw = [&](bool calc_offset) {
       auto EE_user = ConstEEIUses.front();