Skip to content

Commit e20c198

Browse files
igorban-inteligcbot
authored andcommitted
Refactoring lit-config for llvm-16
Refactoring of parameters in vc-lits Do not link initializeGenX function - always inline
1 parent decce53 commit e20c198

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+247
-216
lines changed

IGC/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,9 @@ if(IGC_BUILD_LLVM_INTERIM AND IGC_BUILD__VC_ENABLED)
444444
include("${IGC_SOURCE_DIR}/../external/vc-intrinsics/CMakeLists.txt")
445445
endif()
446446

447+
if(NOT IGC_BUILD__VC_ENABLED OR NOT DEFINED IGC_BUILD__VC_ENABLED)
448+
set(IGC_BUILD__CMLIT_ENABLE OFF)
449+
endif()
447450
# ======================================== Path helper variables =======================================
448451

449452
set(IGC_BUILD__IGC_SRC_DIR "${IGC_SOURCE_DIR}")

IGC/VectorCompiler/include/vc/GenXCodeGen/GenXTarget.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*========================== begin_copyright_notice ============================
22
3-
Copyright (C) 2019-2021 Intel Corporation
3+
Copyright (C) 2019-2025 Intel Corporation
44
55
SPDX-License-Identifier: MIT
66
@@ -15,7 +15,7 @@ extern "C" void LLVMInitializeGenXTargetMC();
1515
extern "C" void LLVMInitializeGenXPasses();
1616

1717
namespace llvm {
18-
void initializeGenX() {
18+
static inline void initializeGenX() {
1919
LLVMInitializeGenXTargetInfo();
2020
LLVMInitializeGenXTarget();
2121
LLVMInitializeGenXTargetMC();

IGC/VectorCompiler/lib/PassPluginLibrary/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#=========================== begin_copyright_notice ============================
22
#
3-
# Copyright (C) 2024 Intel Corporation
3+
# Copyright (C) 2024-2025 Intel Corporation
44
#
55
# SPDX-License-Identifier: MIT
66
#

IGC/VectorCompiler/lib/PassPluginLibrary/Plugin.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*========================== begin_copyright_notice ============================
22
3-
Copyright (C) 2024 Intel Corporation
3+
Copyright (C) 2024-2025 Intel Corporation
44
55
SPDX-License-Identifier: MIT
66
@@ -62,8 +62,6 @@ void registerPluginPasses(PassBuilder &PB) {
6262
std::string Error = "";
6363
std::string CPUStr = "";
6464
std::string FeaturesStr = "";
65-
const Target *TheTarget = TargetRegistry::lookupTarget(
66-
TheTriple.getArchName().str(), TheTriple, Error);
6765

6866
llvm::TargetMachine *TM =
6967
GetTargetMachine(TheTriple, CPUStr, FeaturesStr, Options);
@@ -105,19 +103,20 @@ void registerPluginPasses(PassBuilder &PB) {
105103
}
106104
} // namespace
107105

108-
PassPluginLibraryInfo getNewPMPluginInfo() {
109-
return {LLVM_PLUGIN_API_VERSION, "NewPMPlugin", "v0.1", registerPluginPasses};
110-
}
111-
112106
#ifdef __GNUC__
113107
#define DLL_PUBLIC __attribute__((visibility("default")))
114108
#else
115109
#define DLL_PUBLIC __declspec(dllexport)
116110
#endif
117111

118-
// TODO: Fix visibility
119112
extern "C" {
113+
PassPluginLibraryInfo DLL_PUBLIC getNewPMPluginInfo() {
114+
return {LLVM_PLUGIN_API_VERSION, "NewPMPlugin", "v0.1", registerPluginPasses};
115+
}
116+
117+
#if !(defined(_WIN64) || defined(_WIN32))
120118
LLVM_ATTRIBUTE_WEAK DLL_PUBLIC PassPluginLibraryInfo llvmGetPassPluginInfo() {
121119
return getNewPMPluginInfo();
122120
}
121+
#endif
123122
}

IGC/VectorCompiler/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#=========================== begin_copyright_notice ============================
22
#
3-
# Copyright (C) 2020-2023 Intel Corporation
3+
# Copyright (C) 2020-2025 Intel Corporation
44
#
55
# SPDX-License-Identifier: MIT
66
#

IGC/VectorCompiler/test/GenXArgindirection/warn.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;=========================== begin_copyright_notice ============================
22
;
3-
; Copyright (C) 2021 Intel Corporation
3+
; Copyright (C) 2021-2025 Intel Corporation
44
;
55
; SPDX-License-Identifier: MIT
66
;
@@ -9,8 +9,8 @@
99
; The only purpose of this test is to test warning when arg indirection can not happen
1010
; It is convoluted enough for this purpose
1111

12-
; RUN: %opt %use_old_pass_manager% -GenXModule -GenXLiveRangesWrapper -GenXArgIndirectionWrapper -march=genx64 -mcpu=Gen9 -mtriple=spir64-unknown-unknown -S < %s >& %t
13-
; RUN: FileCheck %s < %t
12+
; RUN: %opt %use_old_pass_manager% -GenXModule -GenXLiveRangesWrapper -GenXArgIndirectionWrapper -march=genx64 -mcpu=Gen9 \
13+
; RUN: -mtriple=spir64-unknown-unknown -S %s 2>&1 | FileCheck %s
1414

1515
; CHECK: warning: GenXArgIndirection failed for: < Argument 1 in foo>: Use of argument cannot be indirected
1616

IGC/VectorCompiler/test/GenXBuiltinFunctions/divrem.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;=========================== begin_copyright_notice ============================
22
;
3-
; Copyright (C) 2021-2023 Intel Corporation
3+
; Copyright (C) 2021-2025 Intel Corporation
44
;
55
; SPDX-License-Identifier: MIT
66
;

IGC/VectorCompiler/test/GenXBuiltinFunctions/fdiv_f64.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;=========================== begin_copyright_notice ============================
22
;
3-
; Copyright (C) 2021-2023 Intel Corporation
3+
; Copyright (C) 2021-2025 Intel Corporation
44
;
55
; SPDX-License-Identifier: MIT
66
;

IGC/VectorCompiler/test/GenXBuiltinFunctions/fsqrt_f64.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;=========================== begin_copyright_notice ============================
22
;
3-
; Copyright (C) 2021-2023 Intel Corporation
3+
; Copyright (C) 2021-2025 Intel Corporation
44
;
55
; SPDX-License-Identifier: MIT
66
;

IGC/VectorCompiler/test/GenXCoalescing/nested-structs.s

Whitespace-only changes.

0 commit comments

Comments
 (0)