Skip to content
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

Jump to bottom

Disable the tiny codemodel on osx #450

Merged
merged 3 commits into from
Sep 9, 2024
Merged

Disable the tiny codemodel on osx #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6509ee6
Disable the tiny codemodel on osx.
bluescarni Sep 9, 2024
0b4a34e
gha debug.
bluescarni Sep 9, 2024
babb5fd
Pin compilers on OSX CI.
bluescarni Sep 9, 2024
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
6 changes: 5 additions & 1 deletion src/llvm_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,11 @@ llvm::orc::JITTargetMachineBuilder create_jit_tmb(unsigned opt_level, code_model
#if defined(HEYOKA_ARCH_X86)
code_model::small, code_model::kernel, code_model::medium, code_model::large
#elif defined(HEYOKA_ARCH_ARM)
code_model::tiny, code_model::small, code_model::large
// NOTE: tiny code model not supported on OSX.
#if !defined(__APPLE__)
code_model::tiny,
#endif
code_model::small, code_model::large
#elif defined(HEYOKA_ARCH_PPC)
code_model::small, code_model::medium, code_model::large
#else
Expand Down
4 changes: 2 additions & 2 deletions test/llvm_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,8 @@ TEST_CASE("code model")
REQUIRE(oss.str() == "small");
}

// code_model::tiny not supported on x86 or ppc.
#if defined(HEYOKA_ARCH_X86) || defined(HEYOKA_ARCH_PPC)
// code_model::tiny not supported on x86 or ppc or OSX
#if defined(HEYOKA_ARCH_X86) || defined(HEYOKA_ARCH_PPC) || defined(__APPLE__)

{
std::ostringstream oss;
Expand Down
2 changes: 1 addition & 1 deletion tools/gha_osx_arm64_static.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge
export deps_dir=$HOME/local
export PATH="$HOME/miniconda/bin:$PATH"
bash miniconda.sh -b -p $HOME/miniconda
mamba create -y -p $deps_dir c-compiler zlib cxx-compiler libcxx cmake ninja \
mamba create -y -p $deps_dir 'c-compiler<1.8' zlib 'cxx-compiler<1.8' libcxx cmake ninja \
llvmdev tbb-devel tbb libboost-devel sleef xtensor xtensor-blas blas \
blas-devel fmt spdlog 'mppp=1.*'
source activate $deps_dir
Expand Down
2 changes: 1 addition & 1 deletion tools/gha_osx_x86.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge
export deps_dir=$HOME/local
export PATH="$HOME/miniconda/bin:$PATH"
bash miniconda.sh -b -p $HOME/miniconda
mamba create -y -p $deps_dir c-compiler zlib cxx-compiler libcxx 'cmake>=3.18' ninja \
mamba create -y -p $deps_dir 'c-compiler<1.8' zlib 'cxx-compiler<1.8' libcxx cmake ninja \
llvmdev tbb-devel tbb libboost-devel sleef xtensor xtensor-blas blas \
blas-devel fmt spdlog 'mppp=1.*'
source activate $deps_dir
Expand Down
2 changes: 1 addition & 1 deletion tools/gha_osx_x86_static.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge
export deps_dir=$HOME/local
export PATH="$HOME/miniconda/bin:$PATH"
bash miniconda.sh -b -p $HOME/miniconda
mamba create -y -p $deps_dir c-compiler zlib cxx-compiler libcxx 'cmake>=3.18' ninja \
mamba create -y -p $deps_dir 'c-compiler<1.8' zlib 'cxx-compiler<1.8' libcxx cmake ninja \
llvmdev tbb-devel tbb libboost-devel sleef xtensor xtensor-blas blas \
blas-devel fmt spdlog 'mppp=1.*'
source activate $deps_dir
Expand Down
Loading