From 5f9ed8a61d4e23a989f528f4e2745011df5bad86 Mon Sep 17 00:00:00 2001 From: "Bodrova, Anastasia" Date: Fri, 20 Sep 2024 10:27:05 +0000 Subject: [PATCH] Revert "Re-enable selective scalarization" --------------------------- --- IGC/Compiler/Optimizer/Scalarizer.h | 5 ++--- IGC/common/igc_flags.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/IGC/Compiler/Optimizer/Scalarizer.h b/IGC/Compiler/Optimizer/Scalarizer.h index 9841e83bc990..d06ac0fc8f51 100644 --- a/IGC/Compiler/Optimizer/Scalarizer.h +++ b/IGC/Compiler/Optimizer/Scalarizer.h @@ -274,12 +274,11 @@ namespace IGC } // namespace IGC -/// @brief By default (no argument given to this function), selective scalarization is controlled -/// by the `EnableSelectiveScalarizer` regkey. +/// @brief By default (no argument given to this function), selective scalarization is off. /// Selective scalarization keeps some instructions vectorized, if the vector is used as the whole entity. /// The pass builds a web of instructions protected from scalarization. /// The ending legs of the web consist of vectorial instructions such as insert and extract elements, /// vector shuffles, GenISA intrinsics and function calls. /// The vectorial instructions inside the web consist of bitcasts and PHI nodes. extern "C" llvm::FunctionPass *createScalarizerPass( - IGC::SelectiveScalarizer selectiveMode = IGC::SelectiveScalarizer::Auto); + IGC::SelectiveScalarizer selectiveMode = IGC::SelectiveScalarizer::Off); diff --git a/IGC/common/igc_flags.h b/IGC/common/igc_flags.h index 5dce40bba224..16b9ae26da77 100644 --- a/IGC/common/igc_flags.h +++ b/IGC/common/igc_flags.h @@ -486,7 +486,7 @@ DECLARE_IGC_REGKEY(bool, DisableMergeStore, false, "[temp]If EnableL DECLARE_IGC_REGKEY(DWORD,MaxLiveOutThreshold, 0, "Max LiveOut Threshold in MemOpt2", false) DECLARE_IGC_REGKEY(bool, DisableScalarAtomics, false, "Disable the Scalar Atomics optimization", false) DECLARE_IGC_REGKEY(bool, EnableScalarTypedAtomics, true, "Enable the Scalar Typed Atomics optimization", false) -DECLARE_IGC_REGKEY(bool, EnableSelectiveScalarizer, true, "Enable selective scalarizer on GPGPU path", true) +DECLARE_IGC_REGKEY(bool, EnableSelectiveScalarizer, false, "enable selective scalarizer on GPGPU path", true) DECLARE_IGC_REGKEY(bool, HoistPSConstBufferValues, true, "Hoists up down converts for contant buffer accesses, so they an be vectorized more easily.", false) DECLARE_IGC_REGKEY(bool, EnableSingleVertexDispatch, false, "Vertex Shader Single Patch Dispatch Regkey", false) DECLARE_IGC_REGKEY(bool, allowLICM, true, "Enable LICM in IGC.", true)