Move types legalization from SPIRV Translator to OCL Unification

Author: aratajew

IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp

@@ -54,7 +54,6 @@ THE SOFTWARE.
 #include "llvmWrapper/Support/TypeSize.h"
 
 #include <llvm/Support/ScaledNumber.h>
-#include <llvm/IR/LegacyPassManager.h>
 #include <llvm/IR/IntrinsicInst.h>
 #include "libSPIRV/SPIRVDebugInfoExt.h"
 #include "llvm/Transforms/Utils/Cloning.h"
@@ -68,7 +67,6 @@ THE SOFTWARE.
 #include "libSPIRV/SPIRVMemAliasingINTEL.h"
 #include "SPIRVInternal.h"
 #include "common/MDFrameWork.h"
-#include "../../AdaptorCommon/TypesLegalizationPass.hpp"
 #include <llvm/Transforms/Scalar.h>
 #include <llvm/IR/MDBuilder.h>
 
@@ -4534,11 +4532,6 @@ bool ReadSPIRV(LLVMContext &C, std::istream &IS, Module *&M,
       Succeed = false;
     }
 
-    llvm::legacy::PassManager PM;
-    PM.add(new TypesLegalizationPass());
-    PM.add(createDeadCodeEliminationPass());
-    PM.run(*M);
-
 #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
     if (DbgSaveTmpLLVM)
       dumpLLVM(M, DbgTmpLLVMFileName);

IGC/AdaptorOCL/UnifyIROCL.cpp

@@ -31,6 +31,7 @@ SPDX-License-Identifier: MIT
 #include "AdaptorCommon/AddImplicitArgs.hpp"
 #include "AdaptorCommon/ProcessFuncAttributes.h"
 #include "AdaptorCommon/LegalizeFunctionSignatures.h"
+#include "AdaptorCommon/TypesLegalizationPass.hpp"
 #include "common/LLVMUtils.h"
 
 #include "Compiler/CISACodeGen/ShaderCodeGen.hpp"
@@ -259,6 +260,8 @@ static void CommonOCLBasedPasses(
         pContext->m_InternalOptions.EnableZEBinary;
 
     IGCPassManager mpmSPIR(pContext, "Unify");
+    mpmSPIR.add(new TypesLegalizationPass());
+    mpmSPIR.add(createDeadCodeEliminationPass());
     mpmSPIR.add(new MetaDataUtilsWrapper(pMdUtils, pContext->getModuleMetaData()));
     mpmSPIR.add(new CodeGenContextWrapper(pContext));
     mpmSPIR.add(new SPIRMetaDataTranslation());