From 6830c9d5b162e370bff4848d5559726526b82857 Mon Sep 17 00:00:00 2001 From: Zentrik Date: Sun, 5 Jan 2025 12:56:29 +0000 Subject: [PATCH 1/5] [LLVM] Rebuild for riscv64 but change version number --- L/LLVM/LLVM_full@19/build_tarballs.jl | 4 ++-- L/LLVM/LLVM_full_assert@19/build_tarballs.jl | 4 ++-- L/LLVM/common.jl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/L/LLVM/LLVM_full@19/build_tarballs.jl b/L/LLVM/LLVM_full@19/build_tarballs.jl index 18c27371279..c02e9d18c36 100644 --- a/L/LLVM/LLVM_full@19/build_tarballs.jl +++ b/L/LLVM/LLVM_full@19/build_tarballs.jl @@ -1,7 +1,7 @@ -version = v"19.1.1" +version = v"19.2.1" # We had to bump the minor version number to change compat bounds for riscv64 support, but from next version we can go back to follow upstream version number include("../common.jl") build_tarballs(ARGS, configure_build(ARGS, version; experimental_platforms=true)...; - preferred_gcc_version=v"10", preferred_llvm_version=v"18", julia_compat="1.6") + preferred_gcc_version=v"13", preferred_llvm_version=v"18", julia_compat="1.6") # Build trigger: 5 diff --git a/L/LLVM/LLVM_full_assert@19/build_tarballs.jl b/L/LLVM/LLVM_full_assert@19/build_tarballs.jl index 87816e07384..d3b4e4d7acf 100644 --- a/L/LLVM/LLVM_full_assert@19/build_tarballs.jl +++ b/L/LLVM/LLVM_full_assert@19/build_tarballs.jl @@ -1,7 +1,7 @@ -version = v"19.1.1" +version = v"19.2.1" # We had to bump the minor version number to change compat bounds for riscv64 support, but from next version we can go back to follow upstream version number include("../common.jl") build_tarballs(ARGS, configure_build(ARGS, version; assert=true, experimental_platforms=true)...; - preferred_gcc_version=v"10", preferred_llvm_version=v"18", julia_compat="1.6") + preferred_gcc_version=v"13", preferred_llvm_version=v"18", julia_compat="1.6") # Build trigger: 6 diff --git a/L/LLVM/common.jl b/L/LLVM/common.jl index 08ffc47129a..8901d1fb986 100644 --- a/L/LLVM/common.jl +++ b/L/LLVM/common.jl @@ -20,7 +20,7 @@ const llvm_tags = Dict( v"16.0.6" => "499f87882a4ba1837ec12a280478cf4cb0d2753d", # julia-16.0.6-2 v"17.0.6" => "0007e48608221f440dce2ea0d3e4f561fc10d3c6", # julia-17.0.6-5 v"18.1.7" => "ed30d043a240d06bb6e010a41086e75713156f4f", # julia-18.1.7-2 - v"19.1.1" => "49c6812e2c4624a7f0cee34859a0511209f44b67", # julia-19.1.1-1 + v"19.2.1" => "49c6812e2c4624a7f0cee34859a0511209f44b67", # julia-19.1.1-1 ) const buildscript = raw""" From 941217a6af0d1c52d92e0bf8f3ffb336d8e5f201 Mon Sep 17 00:00:00 2001 From: Zentrik Date: Sun, 5 Jan 2025 13:00:53 +0000 Subject: [PATCH 2/5] Undo version bump --- L/LLVM/LLVM_full@19/build_tarballs.jl | 2 +- L/LLVM/LLVM_full_assert@19/build_tarballs.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/L/LLVM/LLVM_full@19/build_tarballs.jl b/L/LLVM/LLVM_full@19/build_tarballs.jl index c02e9d18c36..997cab62134 100644 --- a/L/LLVM/LLVM_full@19/build_tarballs.jl +++ b/L/LLVM/LLVM_full@19/build_tarballs.jl @@ -1,4 +1,4 @@ -version = v"19.2.1" # We had to bump the minor version number to change compat bounds for riscv64 support, but from next version we can go back to follow upstream version number +version = v"19.1.1" include("../common.jl") diff --git a/L/LLVM/LLVM_full_assert@19/build_tarballs.jl b/L/LLVM/LLVM_full_assert@19/build_tarballs.jl index d3b4e4d7acf..0aaf200d74a 100644 --- a/L/LLVM/LLVM_full_assert@19/build_tarballs.jl +++ b/L/LLVM/LLVM_full_assert@19/build_tarballs.jl @@ -1,4 +1,4 @@ -version = v"19.2.1" # We had to bump the minor version number to change compat bounds for riscv64 support, but from next version we can go back to follow upstream version number +version = v"19.1.1" include("../common.jl") From b6da29873214a114e21f4b0ecbc28aecd6f7d212 Mon Sep 17 00:00:00 2001 From: Zentrik Date: Sun, 5 Jan 2025 13:01:17 +0000 Subject: [PATCH 3/5] fixup! Undo version bump --- L/LLVM/common.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/L/LLVM/common.jl b/L/LLVM/common.jl index 8901d1fb986..08ffc47129a 100644 --- a/L/LLVM/common.jl +++ b/L/LLVM/common.jl @@ -20,7 +20,7 @@ const llvm_tags = Dict( v"16.0.6" => "499f87882a4ba1837ec12a280478cf4cb0d2753d", # julia-16.0.6-2 v"17.0.6" => "0007e48608221f440dce2ea0d3e4f561fc10d3c6", # julia-17.0.6-5 v"18.1.7" => "ed30d043a240d06bb6e010a41086e75713156f4f", # julia-18.1.7-2 - v"19.2.1" => "49c6812e2c4624a7f0cee34859a0511209f44b67", # julia-19.1.1-1 + v"19.1.1" => "49c6812e2c4624a7f0cee34859a0511209f44b67", # julia-19.1.1-1 ) const buildscript = raw""" From 1355b59eafefd1051c83566aa82a356305adef97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= <765740+giordano@users.noreply.github.com> Date: Sun, 5 Jan 2025 18:17:07 +0000 Subject: [PATCH 4/5] Apply suggestions from code review --- L/LLVM/LLVM_full@19/build_tarballs.jl | 4 ++-- L/LLVM/LLVM_full_assert@19/build_tarballs.jl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/L/LLVM/LLVM_full@19/build_tarballs.jl b/L/LLVM/LLVM_full@19/build_tarballs.jl index 997cab62134..083d8e1e4bc 100644 --- a/L/LLVM/LLVM_full@19/build_tarballs.jl +++ b/L/LLVM/LLVM_full@19/build_tarballs.jl @@ -3,5 +3,5 @@ version = v"19.1.1" include("../common.jl") build_tarballs(ARGS, configure_build(ARGS, version; experimental_platforms=true)...; - preferred_gcc_version=v"13", preferred_llvm_version=v"18", julia_compat="1.6") -# Build trigger: 5 + preferred_gcc_version=v"10", preferred_llvm_version=v"18", julia_compat="1.6") +# Build trigger: 6 diff --git a/L/LLVM/LLVM_full_assert@19/build_tarballs.jl b/L/LLVM/LLVM_full_assert@19/build_tarballs.jl index 0aaf200d74a..3f436814282 100644 --- a/L/LLVM/LLVM_full_assert@19/build_tarballs.jl +++ b/L/LLVM/LLVM_full_assert@19/build_tarballs.jl @@ -3,5 +3,5 @@ version = v"19.1.1" include("../common.jl") build_tarballs(ARGS, configure_build(ARGS, version; assert=true, experimental_platforms=true)...; - preferred_gcc_version=v"13", preferred_llvm_version=v"18", julia_compat="1.6") -# Build trigger: 6 + preferred_gcc_version=v"10", preferred_llvm_version=v"18", julia_compat="1.6") +# Build trigger: 7 From 8e4a03d503c8c47a0d47f99061fcc1df44bae684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Mon, 6 Jan 2025 11:04:10 +0100 Subject: [PATCH 5/5] [LLVM] Only enable Intel JIT Events on x86_64 architecture --- L/LLVM/LLVM_full@19/build_tarballs.jl | 2 +- L/LLVM/LLVM_full_assert@19/build_tarballs.jl | 2 +- L/LLVM/common.jl | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/L/LLVM/LLVM_full@19/build_tarballs.jl b/L/LLVM/LLVM_full@19/build_tarballs.jl index 083d8e1e4bc..474f102c5b5 100644 --- a/L/LLVM/LLVM_full@19/build_tarballs.jl +++ b/L/LLVM/LLVM_full@19/build_tarballs.jl @@ -4,4 +4,4 @@ include("../common.jl") build_tarballs(ARGS, configure_build(ARGS, version; experimental_platforms=true)...; preferred_gcc_version=v"10", preferred_llvm_version=v"18", julia_compat="1.6") -# Build trigger: 6 +# Build trigger: 7 diff --git a/L/LLVM/LLVM_full_assert@19/build_tarballs.jl b/L/LLVM/LLVM_full_assert@19/build_tarballs.jl index 3f436814282..e0c650bfea3 100644 --- a/L/LLVM/LLVM_full_assert@19/build_tarballs.jl +++ b/L/LLVM/LLVM_full_assert@19/build_tarballs.jl @@ -4,4 +4,4 @@ include("../common.jl") build_tarballs(ARGS, configure_build(ARGS, version; assert=true, experimental_platforms=true)...; preferred_gcc_version=v"10", preferred_llvm_version=v"18", julia_compat="1.6") -# Build trigger: 7 +# Build trigger: 8 diff --git a/L/LLVM/common.jl b/L/LLVM/common.jl index 08ffc47129a..6e9f7fde90a 100644 --- a/L/LLVM/common.jl +++ b/L/LLVM/common.jl @@ -248,7 +248,8 @@ if [[ ${target} == *linux* ]]; then # CMAKE_FLAGS+=(-DLLVM_USE_OPROFILE=1) fi # if [[ ${target} == *linux* ]] || [[ ${target} == *mingw32* ]]; then -if [[ ${target} == *linux* ]]; then # TODO only LLVM12 +if [[ "${LLVM_MAJ_VER}" -ge "12" && ${target} == x86_64-linux* ]]; then + # Intel VTune is available only on x86_64 architectures CMAKE_FLAGS+=(-DLLVM_USE_INTEL_JITEVENTS=1) fi