Skip to content

Commit 9e0096b

Browse files
pszymichigcbot
authored andcommitted
LLVM11 upgrade oriented fixes.
1 parent 5ae1792 commit 9e0096b

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

IGC/AdaptorOCL/OCL/sp/spp_g8.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ SPDX-License-Identifier: MIT
2323
#include "lld/Common/Driver.h"
2424
#include "llvm/Support/Path.h"
2525

26+
#if LLVM_VERSION_MAJOR >= 11
27+
#include "llvm/Support/FileSystem.h"
28+
#endif
29+
2630
#if !defined(_MSC_VER) && !defined(__MINGW32__)
2731
#include <unistd.h>
2832
#else

IGC/Compiler/CISACodeGen/CShader.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ CShader::CShader(Function* pFunc, CShaderProgram* pProgram)
6464
m_HasGlobalStatelessMemoryAccess = false;
6565
m_HasConstantStatelessMemoryAccess = false;
6666

67+
m_simdProgram.init(true, m_ctx->platform.maxPerThreadScratchSpace(), GetContext()->getModuleMetaData()->compOpt.UseScratchSpacePrivateMemory);
6768
}
6869

6970
void CShader::InitEncoder(SIMDMode simdSize, bool canAbortOnSpill, ShaderDispatchMode shaderMode)

IGC/VectorCompiler/igcdeps/src/ShaderOverride.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static std::string legalizeName(std::string Name) {
6262
bool VC_IGCShaderOverrider::override(void *&GenXBin, int &GenXBinSize,
6363
llvm::StringRef ShaderName,
6464
Extensions Ext) const {
65-
std::string const LegalizedShaderName = legalizeName(ShaderName);
65+
std::string const LegalizedShaderName = legalizeName(ShaderName.str());
6666
std::string const FullPath = path(LegalizedShaderName, Ext);
6767
bool Status = false;
6868

0 commit comments

Comments
 (0)