[Autobackout][FuncReg]Revert of change: 9e0096b

LLVM11 upgrade oriented fixes.

Author: pszymich

IGC/AdaptorOCL/OCL/sp/spp_g8.cpp

@@ -23,10 +23,6 @@ SPDX-License-Identifier: MIT
 #include "lld/Common/Driver.h"
 #include "llvm/Support/Path.h"
 
-#if LLVM_VERSION_MAJOR >= 11
-#include "llvm/Support/FileSystem.h"
-#endif
-
 #if !defined(_MSC_VER) && !defined(__MINGW32__)
 #include <unistd.h>
 #else

IGC/Compiler/CISACodeGen/CShader.cpp

@@ -64,7 +64,6 @@ CShader::CShader(Function* pFunc, CShaderProgram* pProgram)
     m_HasGlobalStatelessMemoryAccess = false;
     m_HasConstantStatelessMemoryAccess = false;
 
-    m_simdProgram.init(true, m_ctx->platform.maxPerThreadScratchSpace(), GetContext()->getModuleMetaData()->compOpt.UseScratchSpacePrivateMemory);
 }
 
 void CShader::InitEncoder(SIMDMode simdSize, bool canAbortOnSpill, ShaderDispatchMode shaderMode)

IGC/VectorCompiler/igcdeps/src/ShaderOverride.cpp

@@ -62,7 +62,7 @@ static std::string legalizeName(std::string Name) {
 bool VC_IGCShaderOverrider::override(void *&GenXBin, int &GenXBinSize,
                                      llvm::StringRef ShaderName,
                                      Extensions Ext) const {
-  std::string const LegalizedShaderName = legalizeName(ShaderName.str());
+  std::string const LegalizedShaderName = legalizeName(ShaderName);
   std::string const FullPath = path(LegalizedShaderName, Ext);
   bool Status = false;