Synchronisation between branches.

Change-Id: Ic66f60928a2a6ce2f8a09259da58a6d84b53d871
intel · Jul 10, 2019 · c7dec76 · c7dec76
1 parent 49805b0
commit c7dec76
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 287 deletions.
diff --git a/IGC/Compiler/CISACodeGen/EmitVISAPass.cpp b/IGC/Compiler/CISACodeGen/EmitVISAPass.cpp
@@ -11154,7 +11154,9 @@ void EmitPass::emitAtomicRaw(llvm::GenIntrinsicInst* pInsn)
                 CVariable* pDstAddr2 = m_currShader->GetNewVariable(pDstAddr->GetNumberElement(),
                     ISA_TYPE_UQ, EALIGN_GRF);
                 m_encoder->Cast(pDstAddr2, pDstAddr);
+
                 m_encoder->AtomicRawA64(atomic_op, pDst, pDstAddr2, pSrc0, pSrc1, bitwidth);
+
                 m_encoder->Push();
             }
             else

diff --git a/IGC/Compiler/CISACodeGen/VectorProcess.hpp b/IGC/Compiler/CISACodeGen/VectorProcess.hpp
@@ -92,6 +92,7 @@ namespace IGC
             bool forceByteScatteredRW = false);
 
 
+
     private:
         const EmitPass *m_emitter;
 

diff --git a/IGC/Compiler/igc_workaround.cpp b/IGC/Compiler/igc_workaround.cpp
@@ -61,10 +61,12 @@ void SetWorkaroundTable(SKU_FEATURE_TABLE* pSkuFeatureTable, CPlatform* platform
         InitCnlWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);
         break;
     case IGFX_KABYLAKE:
-        InitKblWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);
+        InitKblDisplayWaTable(&waTable, pSkuFeatureTable, &stWaInitParam); //Display WA only
+        InitKblNonDisplayWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);//Non Display WA
         break;
     case IGFX_COFFEELAKE:
-        InitCflWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);
+        InitKblDisplayWaTable(&waTable, pSkuFeatureTable, &stWaInitParam); //Display WA only
+        InitCflNonDisplayWaTable(&waTable, pSkuFeatureTable, &stWaInitParam); //Non Display WA
         break;
     case IGFX_GEMINILAKE:
         InitGlkWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);

diff --git a/skuwa/icfl_wa.c b/skuwa/icfl_wa.c
@@ -36,7 +36,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define CFL_PCH_SPT_A0_REV_ID     SI_REV_ID(0,0)
 
 
-void InitCflWaTable(PWA_TABLE pWaTable, PSKU_FEATURE_TABLE pSkuTable, PWA_INIT_PARAM pWaParam )
+void InitCflNonDisplayWaTable(PWA_TABLE pWaTable, PSKU_FEATURE_TABLE pSkuTable, PWA_INIT_PARAM pWaParam )
 {
     int iStepId_CFL = (int)pWaParam->usRevId;
     int iStepId_PCH = (int)pWaParam->usRevId_PCH;
@@ -850,155 +850,7 @@ void InitCflWaTable(PWA_TABLE pWaTable, PSKU_FEATURE_TABLE pSkuTable, PWA_INIT_P
         PLATFORM_ALL,
         SI_WA_FOR_EVER);
 
-
-
-
-    SI_WA_ENABLE(
-        WaDisableRCWithAsyncFlip,
-        "No Link Provided" ,
-        "No HWSightingLink provided",
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER
-        );
-
-    SI_WA_ENABLE(
-        WaDisableIPC,
-        "No HWBugLink provided",
-        "No HWSightingLink provided",
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER
-        );
-
-    SI_WA_ENABLE(
-        WaIncreaseLatencyIPCEnabled,
-        "No Link Provided" ,
-        "No Link Provided" ,
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER
-        );
-
-    SI_WA_ENABLE(
-        WaDisableTWM,
-        "No Link Provided" ,
-        "No Link Provided" ,
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER
-        );
-
-    SI_WA_ENABLE(
-        WaIgnoreDDIAStrap,
-        "No HWBugLink provided",
-        "No HWSightingLink provided",
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER 
-        );
-
-    SI_WA_ENABLE(
-        WaWmMemoryReadLatency,
-        "No HWBugLink provided",
-        "No Link Provided" ,
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER 
-        );
-
-    SI_WA_ENABLE(
-        WaControlPrimaryTLBUtilization,
-        "No HWBugLink provided",
-        "No HWSightingLink provided",
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER);
-
-
-    SI_WA_ENABLE(
-         WaEnableChickenDCPR,
-        "TBD",
-        "No Link Provided" ,
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER);
-
-    SI_WA_ENABLE(
-        WaPSR2MultipleRegionUpdateCorruption,
-        "Wa to set 0x42080[3] = 1 before PSR2 enable",
-        "No HWSightingLink provided",
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER);
-
-
-    SI_WA_ENABLE(
-        WaEnableBandWidthLimitation,
-        "TBD",
-        "No HWSightingLink provided",
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER);
 
-    SI_WA_ENABLE(
-        WaWatermarkLinesBlocks,
-        "TBD",
-        "No HWSightingLink provided",
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER);
-
-    SI_WA_ENABLE(
-        WaGTCLockAcquisitionDelay,
-        "Set Min Lock Duration = 1 (bits 11:8 of GTC_PORT_MISC_x) when enabling maintenance phase, and reset to default when maintenance phase is disabled.",
-        "No Link Provided" ,
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER
-        );
-
-    SI_WA_ENABLE(
-        WaUseYCordforPSR2,
-        "No HWBugLink provided",
-        "No HWSightingLink provided",
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER);
-
-    SI_WA_ENABLE(
-        WaPruneModesHavingHfrontPorchBetween122To130,
-        "No Link Provided" ,
-        "Link",
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER);
-
-    SI_WA_ENABLE(
-        WaKeepPG1ActiveDueToDMCIssue,
-        "No HWBugLink provided",
-        "No Link Provided" ,
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER);
-
-    SI_WA_ENABLE(
-        WaPlaneSizeAlignmentFor180Rotation,
-        "No Link Provided" ,
-		"No Link Provided" ,
-        PLATFORM_ALL,
-        SI_WA_FOR_EVER
-    );
-
-	if ((pWaParam->ePCHProductFamily == PCH_CNP_LP) || (pWaParam->ePCHProductFamily == PCH_CNP_H))
-	{
-		SI_WA_ENABLE(
-			WaHardHangonHotPlug,
-			"No Link Provided" ,
-			"No Link Provided" ,
-			PLATFORM_ALL,
-			SI_WA_FOR_EVER);
-	}
-	SI_WA_ENABLE(
-		WaInitCDClkNewSeq,
-		"No HWBugLink provided",
-		"No HWSightingLink provided",
-		PLATFORM_ALL,
-		SI_WA_FOR_EVER);
-
-
-
-
-
-
-
-
-
         SI_WA_ENABLE(
         WaHucStreamoutEnable,
         "No Link Provided" ,