Skip to content

Commit 3d8e049

Browse files
authored
[Benchmarks] fix IGC compilation (#19559)
Recent refactor of compute-runtime utils, #19303, introduced a regression that caused IGC dependencies to be fetched into incorrect directories, causing build failures. This patch fixes the directory path for IGC directories, allowing the recent compute-runtime drivers to be built.
1 parent 8861f6b commit 3d8e049

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

devops/scripts/benchmarks/git_project.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,20 @@ def __init__(
1919
directory: Path,
2020
name: str,
2121
force_rebuild: bool = False,
22+
no_suffix_src: bool = False,
2223
) -> None:
2324
self._url = url
2425
self._ref = ref
2526
self._directory = directory
2627
self._name = name
2728
self._force_rebuild = force_rebuild
29+
self._no_suffix_src = no_suffix_src
2830
self._rebuild_needed = self._git_clone()
2931

3032
@property
3133
def src_dir(self) -> Path:
32-
return self._directory / f"{self._name}-src"
34+
suffix = "" if self._no_suffix_src else "-src"
35+
return self._directory / f"{self._name}{suffix}"
3336

3437
@property
3538
def build_dir(self) -> Path:

devops/scripts/benchmarks/utils/compute_runtime.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,37 +95,43 @@ def build_igc(self, repo, commit) -> tuple[Path, bool]:
9595
"9d255266e1df8f1dc5d11e1fbb03213acfaa4fc7",
9696
Path(options.workdir),
9797
"vc-intrinsics",
98+
no_suffix_src=True,
9899
)
99100
llvm_project = GitProject(
100101
"https://github.com/llvm/llvm-project",
101102
"llvmorg-15.0.7",
102103
Path(options.workdir),
103104
"llvm-project",
105+
no_suffix_src=True,
104106
)
105107
llvm_projects = llvm_project.src_dir / "llvm" / "projects"
106108
GitProject(
107109
"https://github.com/intel/opencl-clang",
108110
"ocl-open-150",
109111
llvm_projects,
110112
"opencl-clang",
113+
no_suffix_src=True,
111114
)
112115
GitProject(
113116
"https://github.com/KhronosGroup/SPIRV-LLVM-Translator",
114117
"llvm_release_150",
115118
llvm_projects,
116119
"llvm-spirv",
120+
no_suffix_src=True,
117121
)
118122
GitProject(
119123
"https://github.com/KhronosGroup/SPIRV-Tools.git",
120124
"f289d047f49fb60488301ec62bafab85573668cc",
121125
Path(options.workdir),
122126
"SPIRV-Tools",
127+
no_suffix_src=True,
123128
)
124129
GitProject(
125130
"https://github.com/KhronosGroup/SPIRV-Headers.git",
126131
"0e710677989b4326ac974fd80c5308191ed80965",
127132
Path(options.workdir),
128133
"SPIRV-Headers",
134+
no_suffix_src=True,
129135
)
130136

131137
configure_args = [

0 commit comments

Comments
 (0)