Skip to content

intel-graphics-compiler: follow-ups #171731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lovesegfault merged 5 commits into from
May 6, 2022
Merged

intel-graphics-compiler: follow-ups #171731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69a71a0
spirv-llvm-translator: move spirv-tools to nativeBuildInputs
lovesegfault May 5, 2022
d14ebd7
intel-graphics-compiler: reindent
lovesegfault May 5, 2022
37c0bfd
spirv-llvm-translator: remove prePatch since we don't run tests
lovesegfault May 5, 2022
f4f9691
intel-graphics-compiler: remove INSTALL_SPIRVDLL
lovesegfault May 5, 2022
eaaa116
intel-graphics-compiler: move substitutes to postPatch
lovesegfault May 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions pkgs/development/compilers/intel-graphics-compiler/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,19 @@ stdenv.mkDerivation rec {
# https://github.com/intel/intel-graphics-compiler/issues/98
doCheck = false;

patchPhase = ''
postPatch = ''
substituteInPlace ./external/SPIRV-Tools/CMakeLists.txt \
--replace '$'''{SPIRV-Tools_DIR}../../..' \
'${spirv-tools}' \
--replace 'SPIRV-Headers_INCLUDE_DIR "/usr/include"' \
'SPIRV-Headers_INCLUDE_DIR "${spirv-headers}/include"' \
--replace 'set_target_properties(SPIRV-Tools' \
'set_target_properties(SPIRV-Tools-shared' \
--replace 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools' \
'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-shared'
substituteInPlace ./IGC/AdaptorOCL/igc-opencl.pc.in \
--replace '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \
--replace '/@CMAKE_INSTALL_LIBDIR@' "/lib"
--replace '$'''{SPIRV-Tools_DIR}../../..' \
'${spirv-tools}' \
--replace 'SPIRV-Headers_INCLUDE_DIR "/usr/include"' \
'SPIRV-Headers_INCLUDE_DIR "${spirv-headers}/include"' \
--replace 'set_target_properties(SPIRV-Tools' \
'set_target_properties(SPIRV-Tools-shared' \
--replace 'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools' \
'IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-shared'
substituteInPlace ./IGC/AdaptorOCL/igc-opencl.pc.in \
--replace '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \
--replace '/@CMAKE_INSTALL_LIBDIR@' "/lib"
'';

# Handholding the braindead build script
Expand All @@ -84,7 +84,6 @@ stdenv.mkDerivation rec {
"-Wno-dev"
"-DVC_INTRINSICS_SRC=${vc_intrinsics_src}"
"-DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds"
"-DINSTALL_SPIRVDLL=0"
"-DCCLANG_BUILD_PREBUILDS=ON"
"-DCCLANG_BUILD_PREBUILDS_DIR=${prebuilds}"
"-DIGC_PREFERRED_LLVM_VERSION=${getVersion llvm}"
Expand Down
10 changes: 2 additions & 8 deletions pkgs/development/compilers/spirv-llvm-translator/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg=";
};

nativeBuildInputs = [ pkg-config cmake llvm_11.dev ];
nativeBuildInputs = [ pkg-config cmake llvm_11.dev spirv-tools ];

buildInputs = [ spirv-headers spirv-tools llvm_11 ];
buildInputs = [ spirv-headers llvm_11 ];

checkInputs = [ lit ];

Expand All @@ -34,12 +34,6 @@ stdenv.mkDerivation rec {
"-DLLVM_SPIRV_BUILD_EXTERNAL=YES"
];

prePatch = ''
substituteInPlace ./test/CMakeLists.txt \
--replace 'SPIRV-Tools' 'SPIRV-Tools-shared'
'';


# FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist
doCheck = false;

Expand Down