From 5dd8e0ef22b322a7c939e7bab2fd89f12cfba8c9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 21 Jul 2023 14:16:13 -0500 Subject: [PATCH 1/5] Set LLVM_HOST_TRIPLE for all builds --- recipe/build.sh | 3 ++- recipe/meta.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index a94efc40..00cab801 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -17,9 +17,10 @@ if [[ "$CC_FOR_BUILD" != "" && "$CC_FOR_BUILD" != "$CC" ]]; then NATIVE_FLAGS="${NATIVE_FLAGS};-DCMAKE_STATIC_LINKER_FLAGS=;-DLLVM_INCLUDE_BENCHMARKS=OFF" NATIVE_FLAGS="${NATIVE_FLAGS};-DLLVM_ENABLE_ZSTD=OFF;-DLLVM_ENABLE_LIBXML2=OFF;-DLLVM_ENABLE_ZLIB=OFF;" CMAKE_ARGS="${CMAKE_ARGS} -DCROSS_TOOLCHAIN_FLAGS_NATIVE=${NATIVE_FLAGS}" - CMAKE_ARGS="${CMAKE_ARGS} -DLLVM_HOST_TRIPLE=$(echo $HOST | sed s/conda/unknown/g) -DLLVM_DEFAULT_TARGET_TRIPLE=$(echo $HOST | sed s/conda/unknown/g)" fi +CMAKE_ARGS="${CMAKE_ARGS} -DLLVM_HOST_TRIPLE=${CONDA_TOOLCHAIN_HOST} -DLLVM_DEFAULT_TARGET_TRIPLE=${CONDA_TOOLCHAIN_HOST}" + # disable -fno-plt due to https://bugs.llvm.org/show_bug.cgi?id=51863 due to some GCC bug if [[ "$target_platform" == "linux-ppc64le" ]]; then CFLAGS="$(echo $CFLAGS | sed 's/-fno-plt //g')" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8ff21403..42a2d1db 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: - patches/0003-restore-macos-10.9-support.patch build: - number: 0 + number: 1 merge_build_host: false requirements: From fc8df49784d069ad979c3c9f7e8d8a33ad434ee4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 28 Jul 2023 08:25:33 +1100 Subject: [PATCH 2/5] place arch-independent options in main CMake invocation --- recipe/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 00cab801..77cdfe2c 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -19,8 +19,6 @@ if [[ "$CC_FOR_BUILD" != "" && "$CC_FOR_BUILD" != "$CC" ]]; then CMAKE_ARGS="${CMAKE_ARGS} -DCROSS_TOOLCHAIN_FLAGS_NATIVE=${NATIVE_FLAGS}" fi -CMAKE_ARGS="${CMAKE_ARGS} -DLLVM_HOST_TRIPLE=${CONDA_TOOLCHAIN_HOST} -DLLVM_DEFAULT_TARGET_TRIPLE=${CONDA_TOOLCHAIN_HOST}" - # disable -fno-plt due to https://bugs.llvm.org/show_bug.cgi?id=51863 due to some GCC bug if [[ "$target_platform" == "linux-ppc64le" ]]; then CFLAGS="$(echo $CFLAGS | sed 's/-fno-plt //g')" @@ -37,6 +35,8 @@ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DLLVM_ENABLE_TERMINFO=OFF \ -DLLVM_ENABLE_ZLIB=FORCE_ON \ -DLLVM_ENABLE_ZSTD=FORCE_ON \ + -DLLVM_DEFAULT_TARGET_TRIPLE=${CONDA_TOOLCHAIN_HOST} \ + -DLLVM_HOST_TRIPLE=${CONDA_TOOLCHAIN_HOST} \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DLLVM_INCLUDE_DOCS=OFF \ -DLLVM_INCLUDE_EXAMPLES=OFF \ From da3c0ebe6168c2ffb93062daf9a4ef58db0444da Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 28 Jul 2023 08:28:09 +1100 Subject: [PATCH 3/5] set LLVM_ENABLE_DUMP=ON towards #227 --- recipe/bld.bat | 1 + recipe/build.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 7f14fc31..d977cfa8 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -14,6 +14,7 @@ cmake -G "Ninja" ^ -DCMAKE_INSTALL_PREFIX:PATH=%LIBRARY_PREFIX% ^ -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL ^ -DLLVM_USE_INTEL_JITEVENTS=ON ^ + -DLLVM_ENABLE_DUMP=ON ^ -DLLVM_ENABLE_LIBXML2=FORCE_ON ^ -DLLVM_ENABLE_RTTI=ON ^ -DLLVM_ENABLE_ZLIB=FORCE_ON ^ diff --git a/recipe/build.sh b/recipe/build.sh index 77cdfe2c..96e5247e 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -29,6 +29,7 @@ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_LIBRARY_PATH="${PREFIX}" \ -DLLVM_ENABLE_BACKTRACES=ON \ + -DLLVM_ENABLE_DUMP=ON \ -DLLVM_ENABLE_LIBEDIT=OFF \ -DLLVM_ENABLE_LIBXML2=FORCE_ON \ -DLLVM_ENABLE_RTTI=ON \ From 0623e04eb26764736637c96b28deea40c3557845 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 28 Jul 2023 12:19:27 +1100 Subject: [PATCH 4/5] MNT: Re-rendered with conda-build 3.26.0, conda-smithy 3.24.1, and conda-forge-pinning 2023.07.27.11.28.36 --- .azure-pipelines/azure-pipelines-linux.yml | 5 ----- README.md | 24 +++++++++++----------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 3b9dee71..fcb0974c 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -23,11 +23,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/README.md b/README.md index 6e3df204..acacf042 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libllvm16-green.svg)](https://anaconda.org/conda-forge/libllvm16) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libllvm16.svg)](https://anaconda.org/conda-forge/libllvm16) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libllvm16.svg)](https://anaconda.org/conda-forge/libllvm16) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libllvm16.svg)](https://anaconda.org/conda-forge/libllvm16) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libllvm17-green.svg)](https://anaconda.org/conda-forge/libllvm17) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libllvm17.svg)](https://anaconda.org/conda-forge/libllvm17) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libllvm17.svg)](https://anaconda.org/conda-forge/libllvm17) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libllvm17.svg)](https://anaconda.org/conda-forge/libllvm17) | | [![Conda Recipe](https://img.shields.io/badge/recipe-lit-green.svg)](https://anaconda.org/conda-forge/lit) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/lit.svg)](https://anaconda.org/conda-forge/lit) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/lit.svg)](https://anaconda.org/conda-forge/lit) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/lit.svg)](https://anaconda.org/conda-forge/lit) | | [![Conda Recipe](https://img.shields.io/badge/recipe-llvm-green.svg)](https://anaconda.org/conda-forge/llvm) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/llvm.svg)](https://anaconda.org/conda-forge/llvm) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/llvm.svg)](https://anaconda.org/conda-forge/llvm) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/llvm.svg)](https://anaconda.org/conda-forge/llvm) | | [![Conda Recipe](https://img.shields.io/badge/recipe-llvm--tools-green.svg)](https://anaconda.org/conda-forge/llvm-tools) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/llvm-tools.svg)](https://anaconda.org/conda-forge/llvm-tools) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/llvm-tools.svg)](https://anaconda.org/conda-forge/llvm-tools) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/llvm-tools.svg)](https://anaconda.org/conda-forge/llvm-tools) | @@ -99,41 +99,41 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `libllvm16, lit, llvm, llvm-tools, llvmdev` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `libllvm17, lit, llvm, llvm-tools, llvmdev` can be installed with `conda`: ``` -conda install libllvm16 lit llvm llvm-tools llvmdev +conda install libllvm17 lit llvm llvm-tools llvmdev ``` or with `mamba`: ``` -mamba install libllvm16 lit llvm llvm-tools llvmdev +mamba install libllvm17 lit llvm llvm-tools llvmdev ``` -It is possible to list all of the versions of `libllvm16` available on your platform with `conda`: +It is possible to list all of the versions of `libllvm17` available on your platform with `conda`: ``` -conda search libllvm16 --channel conda-forge +conda search libllvm17 --channel conda-forge ``` or with `mamba`: ``` -mamba search libllvm16 --channel conda-forge +mamba search libllvm17 --channel conda-forge ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search libllvm16 --channel conda-forge +mamba repoquery search libllvm17 --channel conda-forge -# List packages depending on `libllvm16`: -mamba repoquery whoneeds libllvm16 --channel conda-forge +# List packages depending on `libllvm17`: +mamba repoquery whoneeds libllvm17 --channel conda-forge -# List dependencies of `libllvm16`: -mamba repoquery depends libllvm16 --channel conda-forge +# List dependencies of `libllvm17`: +mamba repoquery depends libllvm17 --channel conda-forge ``` From a6e4e10a3afb071f2841011b6e9499364bb1abf4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 29 Jul 2023 18:05:45 +1100 Subject: [PATCH 5/5] LLVM 17.0.0.rc1 --- recipe/meta.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2fd2def7..5d05ae56 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.0.0.dev0" %} +{% set version = "17.0.0.rc1" %} {% set major_ver = version.split(".")[0] %} {% set git = "git" if version.split(".")[-1] == "dev0" else "" %} @@ -7,10 +7,8 @@ package: version: {{ version }} source: - git_url: https://github.com/llvm/llvm-project.git - git_rev: a4f4d82c35b80b681687b545200456e79a82d9c2 - # url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz - # sha256: ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e + url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/llvm-project-{{ version.replace(".rc", "rc") }}.src.tar.xz + sha256: 8c7d0aa287133c0787916048deb0a372b775d91ead558dab490860772b2f10ad patches: # - patches/intel-D47188-svml-VF.patch # Fixes vectorizer and extends SVML support # - patches/expect-fastmath-entrypoints-in-add-TLI-mappings.ll.patch # adjusts test added in 10.0.0 for intel-D47188-svml-VF.patch effects @@ -19,7 +17,7 @@ source: - patches/0002-restore-macos-10.9-support.patch build: - number: 1 + number: 0 merge_build_host: false requirements: