Skip to content

Commit f505af2

Browse files
mateuszchudykigcbot
authored andcommitted
Remove code for LLVM8
Remove code for LLVM8
1 parent af68a7b commit f505af2

File tree

7 files changed

+16
-62
lines changed

7 files changed

+16
-62
lines changed

IGC/CMakeLists.txt

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,29 +1135,15 @@ foreach(_linkerFlagName IN ITEMS "CMAKE_EXE_LINKER_FLAGS" "CMAKE_SHARED_LINKER_F
11351135
endforeach()
11361136

11371137
if(MSVC)
1138-
if(LLVM_VERSION_MAJOR EQUAL 8)
1139-
message("WA For LLVM8 : Igonre warning 4199 - Need to fix it")
1140-
igc_config_flag_apply_settings(
1141-
LinkerOptions
1142-
CMAKE_SHARED_LINKER_FLAGS
1143-
ALL_PATTERN ""
1144-
SET_RAW
1145-
"/MANIFEST:NO"
1146-
"/ignore:4099"
1147-
"/ignore:4197"
1148-
"/ignore:4199"
1149-
)
1150-
else()
1151-
igc_config_flag_apply_settings(
1152-
LinkerOptions
1153-
CMAKE_SHARED_LINKER_FLAGS
1154-
ALL_PATTERN ""
1155-
SET_RAW
1156-
"/MANIFEST:NO"
1157-
"/ignore:4099"
1158-
"/ignore:4197"
1159-
)
1160-
endif()
1138+
igc_config_flag_apply_settings(
1139+
LinkerOptions
1140+
CMAKE_SHARED_LINKER_FLAGS
1141+
ALL_PATTERN ""
1142+
SET_RAW
1143+
"/MANIFEST:NO"
1144+
"/ignore:4099"
1145+
"/ignore:4197"
1146+
)
11611147

11621148
set(IGC_BUILD__EXPORT_SYMBOLS_LINK_FLAGS_DEBUG
11631149
"${IGC_BUILD__EXPORT_SYMBOLS_LINK_FLAGS_DEBUG}"

IGC/PCH/llvm.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ SPDX-License-Identifier: MIT
238238
#include "llvmWrapper/Support/Alignment.h"
239239
#include "llvmWrapper/Support/FileSystem.h"
240240
#include "llvmWrapper/Support/MathExtras.h"
241-
#include "llvmWrapper/Support/MemoryBuffer.h"
242241
#include "llvmWrapper/Support/Regex.h"
243242
#include "llvmWrapper/Support/TargetRegistry.h"
244243
#include "llvmWrapper/Support/TypeSize.h"
@@ -296,7 +295,6 @@ SPDX-License-Identifier: MIT
296295
// #include "llvm/MC/MCValue.h" - uses llvmWrapper
297296
// #include "llvm/Option/OptTable.h" - uses llvmWrapper
298297
// #include "llvm/Support/FileSystem.h" - uses llvmWrapper
299-
// #include "llvm/Support/MemoryBuffer.h" - uses llvmWrapper
300298
// #include "llvm/Support/PluginLoader.h" - custom defines
301299
// #include "llvm/Support/Regex.h" - uses llvmWrapper
302300
// #include "llvm/Support/SystemUtils.h" - uses llvmWrapper

IGC/VectorCompiler/include/vc/Support/BackendConfig.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,14 @@ SPDX-License-Identifier: MIT
2828
#include "vc/Support/ShaderDump.h"
2929
#include "vc/Support/ShaderOverride.h"
3030

31-
#include "llvmWrapper/Support/MemoryBuffer.h"
32-
3331
#include "Probe/Assertion.h"
3432

3533
#include "inc/common/sku_wa.h"
3634

3735
#include <llvm/Pass.h>
3836
#include <llvm/PassRegistry.h>
3937
#include <llvm/ADT/StringSet.h>
38+
#include <llvm/Support/MemoryBuffer.h>
4039

4140
#include <limits>
4241
#include <memory>

IGC/VectorCompiler/lib/Driver/Driver.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -291,17 +291,17 @@ static GenXBackendData createBackendData(const vc::ExternalData &Data,
291291
"only 32 and 64 bit pointers are expected");
292292
GenXBackendData BackendData;
293293
BackendData.BiFModule[BiFKind::OCLGeneric] =
294-
IGCLLVM::makeMemoryBufferRef(*Data.OCLGenericBIFModule);
294+
llvm::MemoryBufferRef{*Data.OCLGenericBIFModule};
295295
BackendData.BiFModule[BiFKind::VCBuiltins] =
296-
IGCLLVM::makeMemoryBufferRef(*Data.VCBuiltinsBIFModule);
296+
llvm::MemoryBufferRef{*Data.VCBuiltinsBIFModule};
297297
BackendData.BiFModule[BiFKind::VCSPIRVBuiltins] =
298-
IGCLLVM::makeMemoryBufferRef(*Data.VCSPIRVBuiltinsBIFModule);
298+
llvm::MemoryBufferRef{*Data.VCSPIRVBuiltinsBIFModule};
299299
if (PointerSizeInBits == 64)
300300
BackendData.BiFModule[BiFKind::VCPrintf] =
301-
IGCLLVM::makeMemoryBufferRef(*Data.VCPrintf64BIFModule);
301+
llvm::MemoryBufferRef{*Data.VCPrintf64BIFModule};
302302
else
303303
BackendData.BiFModule[BiFKind::VCPrintf] =
304-
IGCLLVM::makeMemoryBufferRef(*Data.VCPrintf32BIFModule);
304+
llvm::MemoryBufferRef{*Data.VCPrintf32BIFModule};
305305

306306
BackendData.VISALTOStrings = Data.VISALTOStrings;
307307
for(auto& FName : Data.DirectCallFunctions) {

IGC/VectorCompiler/lib/Support/BackendConfig.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ void GenXBackendData::setOwningBiFModule(
229229
IGC_ASSERT_MESSAGE(ModuleBuffer, "wrong argument");
230230
IGC_ASSERT(static_cast<size_t>(Kind) < BiFModuleOwner.size());
231231
BiFModuleOwner[Kind] = std::move(ModuleBuffer);
232-
BiFModule[Kind] = IGCLLVM::makeMemoryBufferRef(*BiFModuleOwner[Kind]);
232+
BiFModule[Kind] = llvm::MemoryBufferRef{*BiFModuleOwner[Kind]};
233233
}
234234

235235
void GenXBackendData::setOwningBiFModuleIf(

IGC/WrapperLLVM/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ set(IGC_WrapperLLVM_HDR
5353
"${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Support/Alignment.h"
5454
"${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Support/FileSystem.h"
5555
"${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Support/MathExtras.h"
56-
"${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Support/MemoryBuffer.h"
5756
"${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Support/Regex.h"
5857
"${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Support/SystemUtils.h"
5958
"${CMAKE_CURRENT_SOURCE_DIR}/include/llvmWrapper/Support/TargetRegistry.h"

IGC/WrapperLLVM/include/llvmWrapper/Support/MemoryBuffer.h

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)