From 6aae34ec53daf92a5ff272fb56757109003edb99 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 9 May 2023 14:23:26 -0400 Subject: Tests: Fix RunCMake.XcodeProject XcodeSchemaGeneration case on arm64 Explicitly specify the xcodebuild scheme destination architecture to match the host. --- Tests/RunCMake/CMakeLists.txt | 1 + Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 75f2d35..ae7bdeb 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -672,6 +672,7 @@ endif() if(XCODE_VERSION) add_RunCMake_test(XcodeProject -DXCODE_VERSION=${XCODE_VERSION} + -DCMAKE_HOST_SYSTEM_PROCESSOR=${CMAKE_HOST_SYSTEM_PROCESSOR} -DCMake_TEST_Swift=${CMake_TEST_Swift}) add_RunCMake_test(XcodeProject-Embed -DXCODE_VERSION=${XCODE_VERSION}) diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake index 3910127..61f7c40 100644 --- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake +++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake @@ -101,7 +101,7 @@ function(XcodeSchemaGeneration) run_cmake(XcodeSchemaGeneration) if (XCODE_VERSION VERSION_GREATER_EQUAL 13) - set(maybe_destination -destination platform=macOS) + set(maybe_destination -destination platform=macOS,arch=${CMAKE_HOST_SYSTEM_PROCESSOR}) else() set(maybe_destination "") endif() -- cgit v0.12 From 3a9b8ef0477a41e0146d7ab82f761fdc57f8b351 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 9 May 2023 14:05:32 -0400 Subject: Tests: Teach ISPC tests to run on macOS arm64 host --- Tests/ISPC/ChainedStaticLibraries/CMakeLists.txt | 11 ++++++++--- Tests/ISPC/CustomHeaderSuffix/CMakeLists.txt | 6 +++++- Tests/ISPC/Defines/CMakeLists.txt | 7 ++++++- Tests/ISPC/DynamicLibrary/CMakeLists.txt | 9 +++++++-- Tests/ISPC/ObjectGenex/CMakeLists.txt | 11 ++++++++--- Tests/ISPC/ObjectLibrary/CMakeLists.txt | 6 +++++- Tests/ISPC/ResponseAndDefine/CMakeLists.txt | 12 +++++++----- Tests/ISPC/StaticLibrary/CMakeLists.txt | 10 +++++++--- Tests/ISPC/SystemIncludes/CMakeLists.txt | 11 +++++++---- Tests/RunCMake/CMakeLists.txt | 1 + .../install/FILES-EXTRA_ISPC_TARGET_OBJECTS-all-check.cmake | 6 +++++- Tests/RunCMake/install/FILES-EXTRA_ISPC_TARGET_OBJECTS.cmake | 6 +++++- 12 files changed, 71 insertions(+), 25 deletions(-) diff --git a/Tests/ISPC/ChainedStaticLibraries/CMakeLists.txt b/Tests/ISPC/ChainedStaticLibraries/CMakeLists.txt index 9a255a0..a09f638 100644 --- a/Tests/ISPC/ChainedStaticLibraries/CMakeLists.txt +++ b/Tests/ISPC/ChainedStaticLibraries/CMakeLists.txt @@ -11,10 +11,15 @@ add_library(ispc_objects1 STATIC extra.ispc extra.cxx) add_library(ispc_objects2 STATIC simple.ispc) set_target_properties(ispc_objects1 PROPERTIES POSITION_INDEPENDENT_CODE ON) -set_target_properties(ispc_objects1 PROPERTIES ISPC_INSTRUCTION_SETS "sse2-i32x4;avx1-i32x16;avx2-i32x4") - set_target_properties(ispc_objects2 PROPERTIES POSITION_INDEPENDENT_CODE ON) -set_target_properties(ispc_objects2 PROPERTIES ISPC_INSTRUCTION_SETS "sse2-i32x4") + +if("${CMAKE_SYSTEM_NAME};${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "Darwin;arm64") + set_property(TARGET ispc_objects1 PROPERTY ISPC_INSTRUCTION_SETS "neon-i32x4") + set_property(TARGET ispc_objects2 PROPERTY ISPC_INSTRUCTION_SETS "neon-i32x4") +else() + set_property(TARGET ispc_objects1 PROPERTY ISPC_INSTRUCTION_SETS "sse2-i32x4;avx1-i32x16;avx2-i32x4") + set_property(TARGET ispc_objects2 PROPERTY ISPC_INSTRUCTION_SETS "sse2-i32x4") +endif() target_link_libraries(ispc_objects2 PRIVATE ispc_objects1) diff --git a/Tests/ISPC/CustomHeaderSuffix/CMakeLists.txt b/Tests/ISPC/CustomHeaderSuffix/CMakeLists.txt index d20f88e..4cf5ca1 100644 --- a/Tests/ISPC/CustomHeaderSuffix/CMakeLists.txt +++ b/Tests/ISPC/CustomHeaderSuffix/CMakeLists.txt @@ -6,7 +6,11 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 4) set(CMAKE_ISPC_FLAGS "--arch=x86") endif() -set(CMAKE_ISPC_INSTRUCTION_SETS "sse2-i32x4;sse4-i8x16") +if("${CMAKE_SYSTEM_NAME};${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "Darwin;arm64") + set(CMAKE_ISPC_INSTRUCTION_SETS "neon-i32x4") +else() + set(CMAKE_ISPC_INSTRUCTION_SETS "sse2-i32x4;sse4-i8x16") +endif() set(CMAKE_ISPC_HEADER_SUFFIX ".ispc.h") diff --git a/Tests/ISPC/Defines/CMakeLists.txt b/Tests/ISPC/Defines/CMakeLists.txt index 7645804..2b99469 100644 --- a/Tests/ISPC/Defines/CMakeLists.txt +++ b/Tests/ISPC/Defines/CMakeLists.txt @@ -1,7 +1,12 @@ cmake_minimum_required(VERSION 3.18) project(ISPCDefines CXX ISPC) -set(CMAKE_ISPC_INSTRUCTION_SETS "sse2-i32x4;sse4-i16x8;avx1-i32x16;avx2-i32x4;avx512knl-i32x16;avx512skx-i32x8") +if("${CMAKE_SYSTEM_NAME};${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "Darwin;arm64") + set(CMAKE_ISPC_INSTRUCTION_SETS "neon-i32x4") +else() + set(CMAKE_ISPC_INSTRUCTION_SETS "sse2-i32x4;sse4-i16x8;avx1-i32x16;avx2-i32x4;avx512knl-i32x16;avx512skx-i32x8") +endif() + set(CMAKE_ISPC_FLAGS -DM_PI=3.1415926535f) add_compile_definitions([==[STRUCT_DEFINE=struct{uniform int a]==]) diff --git a/Tests/ISPC/DynamicLibrary/CMakeLists.txt b/Tests/ISPC/DynamicLibrary/CMakeLists.txt index 4655090..516cdc1 100644 --- a/Tests/ISPC/DynamicLibrary/CMakeLists.txt +++ b/Tests/ISPC/DynamicLibrary/CMakeLists.txt @@ -13,8 +13,13 @@ target_sources(ispc_objects2 PRIVATE simple.cxx) set_target_properties(ispc_objects1 PROPERTIES POSITION_INDEPENDENT_CODE ON) -set_target_properties(ispc_objects1 PROPERTIES ISPC_INSTRUCTION_SETS "sse2-i32x4;avx1-i32x16;avx2-i32x4") -set_target_properties(ispc_objects2 PROPERTIES ISPC_INSTRUCTION_SETS "sse2-i32x4") +if("${CMAKE_SYSTEM_NAME};${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "Darwin;arm64") + set_property(TARGET ispc_objects1 PROPERTY ISPC_INSTRUCTION_SETS "neon-i32x4") + set_property(TARGET ispc_objects2 PROPERTY ISPC_INSTRUCTION_SETS "neon-i32x4") +else() + set_property(TARGET ispc_objects1 PROPERTY ISPC_INSTRUCTION_SETS "sse2-i32x4;avx1-i32x16;avx2-i32x4") + set_property(TARGET ispc_objects2 PROPERTY ISPC_INSTRUCTION_SETS "sse2-i32x4") +endif() target_link_libraries(ispc_objects2 PUBLIC ispc_objects1) diff --git a/Tests/ISPC/ObjectGenex/CMakeLists.txt b/Tests/ISPC/ObjectGenex/CMakeLists.txt index bc0cbf6..5e64004 100644 --- a/Tests/ISPC/ObjectGenex/CMakeLists.txt +++ b/Tests/ISPC/ObjectGenex/CMakeLists.txt @@ -1,7 +1,14 @@ cmake_minimum_required(VERSION 3.18) project(ISPCObjectGenex CXX ISPC) -set(CMAKE_ISPC_INSTRUCTION_SETS "sse2-i32x4;sse4-i16x8;avx1-i32x16;avx2-i32x4;avx512knl-i32x16;avx512skx-i32x8") +if("${CMAKE_SYSTEM_NAME};${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "Darwin;arm64") + set(CMAKE_ISPC_INSTRUCTION_SETS "neon-i32x4") + set(numberOfTargets 1) +else() + set(CMAKE_ISPC_INSTRUCTION_SETS "sse2-i32x4;sse4-i16x8;avx1-i32x16;avx2-i32x4;avx512knl-i32x16;avx512skx-i32x8") + list(LENGTH CMAKE_ISPC_INSTRUCTION_SETS numberOfTargets) + math(EXPR numberOfTargets "${numberOfTargets}+1") +endif() add_library(ispc_objects OBJECT simple.ispc @@ -35,8 +42,6 @@ static std::string obj_paths = "$"; add_executable(ISPCObjectGenex main.cxx) add_dependencies(ISPCObjectGenex ispc_objects) -list(LENGTH CMAKE_ISPC_INSTRUCTION_SETS numberOfTargets) -math(EXPR numberOfTargets "${numberOfTargets}+1") target_compile_definitions(ISPCObjectGenex PRIVATE "ExpectedISPCObjects=${numberOfTargets}" "CONFIG_TYPE=gen_$>" diff --git a/Tests/ISPC/ObjectLibrary/CMakeLists.txt b/Tests/ISPC/ObjectLibrary/CMakeLists.txt index a4c81a9..60ce920 100644 --- a/Tests/ISPC/ObjectLibrary/CMakeLists.txt +++ b/Tests/ISPC/ObjectLibrary/CMakeLists.txt @@ -11,8 +11,12 @@ endif() add_library(ispc_objects OBJECT simple.ispc subdir/extra.ispc) set_target_properties(ispc_objects PROPERTIES POSITION_INDEPENDENT_CODE ON) -set_target_properties(ispc_objects PROPERTIES ISPC_INSTRUCTION_SETS "sse2-i32x4;sse4-i8x16") +if("${CMAKE_SYSTEM_NAME};${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "Darwin;arm64") + set_property(TARGET ispc_objects PROPERTY ISPC_INSTRUCTION_SETS "neon-i32x4") +else() + set_property(TARGET ispc_objects PROPERTY ISPC_INSTRUCTION_SETS "sse2-i32x4;sse4-i8x16") +endif() add_executable(ISPCObjectLibrary main.cxx extra.cxx) target_link_libraries(ISPCObjectLibrary PRIVATE ispc_objects) diff --git a/Tests/ISPC/ResponseAndDefine/CMakeLists.txt b/Tests/ISPC/ResponseAndDefine/CMakeLists.txt index 7539209..d29cb2a 100644 --- a/Tests/ISPC/ResponseAndDefine/CMakeLists.txt +++ b/Tests/ISPC/ResponseAndDefine/CMakeLists.txt @@ -14,13 +14,15 @@ add_executable(ISPCResponseAndDefine main.cxx simple.ispc) set_target_properties(ISPCResponseAndDefine PROPERTIES POSITION_INDEPENDENT_CODE ON) target_include_directories(ISPCResponseAndDefine PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") -target_compile_options(ISPCResponseAndDefine PRIVATE "$<$:--target=sse2-i32x4>") -if(CMAKE_SIZEOF_VOID_P EQUAL 4) - target_compile_options(ISPCResponseAndDefine PRIVATE "$<$:--arch=x86>") +if("${CMAKE_SYSTEM_NAME};${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "Darwin;arm64") + target_compile_options(ISPCResponseAndDefine PRIVATE "$<$:--target=neon-i32x4>") +else() + target_compile_options(ISPCResponseAndDefine PRIVATE "$<$:--target=sse2-i32x4>") + if(CMAKE_SIZEOF_VOID_P EQUAL 4) + target_compile_options(ISPCResponseAndDefine PRIVATE "$<$:--arch=x86>") + endif() endif() - - target_compile_definitions(ISPCResponseAndDefine PRIVATE "$<$:STRUCT_DEFINE=struct{uniform int a>;M_PI=3.14159f") target_include_directories(ISPCResponseAndDefine PRIVATE diff --git a/Tests/ISPC/StaticLibrary/CMakeLists.txt b/Tests/ISPC/StaticLibrary/CMakeLists.txt index ebe5960..76f78e5 100644 --- a/Tests/ISPC/StaticLibrary/CMakeLists.txt +++ b/Tests/ISPC/StaticLibrary/CMakeLists.txt @@ -4,9 +4,13 @@ project(ISPCStaticLibrary CXX ISPC) add_library(ispc_objects STATIC simple.ispc) -target_compile_options(ispc_objects PRIVATE "$<$:--target=sse2-i32x4>") -if(CMAKE_SIZEOF_VOID_P EQUAL 4) - target_compile_options(ispc_objects PRIVATE "$<$:--arch=x86>") +if("${CMAKE_SYSTEM_NAME};${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "Darwin;arm64") + target_compile_options(ispc_objects PRIVATE "$<$:--target=neon-i32x4>") +else() + target_compile_options(ispc_objects PRIVATE "$<$:--target=sse2-i32x4>") + if(CMAKE_SIZEOF_VOID_P EQUAL 4) + target_compile_options(ispc_objects PRIVATE "$<$:--arch=x86>") + endif() endif() set_target_properties(ispc_objects PROPERTIES POSITION_INDEPENDENT_CODE ON) diff --git a/Tests/ISPC/SystemIncludes/CMakeLists.txt b/Tests/ISPC/SystemIncludes/CMakeLists.txt index d94e75e..3b4c289 100644 --- a/Tests/ISPC/SystemIncludes/CMakeLists.txt +++ b/Tests/ISPC/SystemIncludes/CMakeLists.txt @@ -7,8 +7,11 @@ set_target_properties(ISPCSystemIncludes PROPERTIES POSITION_INDEPENDENT_CODE ON set_target_properties(ISPCSystemIncludes PROPERTIES ISPC_HEADER_SUFFIX ".ispc.h") target_include_directories(ISPCSystemIncludes SYSTEM PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") - -target_compile_options(ISPCSystemIncludes PRIVATE "$<$:--target=sse2-i32x4>") -if(CMAKE_SIZEOF_VOID_P EQUAL 4) - target_compile_options(ISPCSystemIncludes PRIVATE "$<$:--arch=x86>") +if("${CMAKE_SYSTEM_NAME};${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "Darwin;arm64") + target_compile_options(ISPCSystemIncludes PRIVATE "$<$:--target=neon-i32x4>") +else() + target_compile_options(ISPCSystemIncludes PRIVATE "$<$:--target=sse2-i32x4>") + if(CMAKE_SIZEOF_VOID_P EQUAL 4) + target_compile_options(ISPCSystemIncludes PRIVATE "$<$:--arch=x86>") + endif() endif() diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index ae7bdeb..cea8cff 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -791,6 +791,7 @@ endif() add_RunCMake_test(install -DNO_NAMELINK=${NO_NAMELINK} -DCYGWIN=${CYGWIN} -DMSYS=${MSYS} -DCMAKE_SHARED_LIBRARY_RPATH_ORIGIN_TOKEN=${CMAKE_SHARED_LIBRARY_RPATH_ORIGIN_TOKEN} -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME} + -DCMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR} -DCMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG=${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG} -DCMAKE_EXECUTABLE_FORMAT=${CMAKE_EXECUTABLE_FORMAT} -DCMake_TEST_ISPC=${CMake_TEST_ISPC} diff --git a/Tests/RunCMake/install/FILES-EXTRA_ISPC_TARGET_OBJECTS-all-check.cmake b/Tests/RunCMake/install/FILES-EXTRA_ISPC_TARGET_OBJECTS-all-check.cmake index 8750a76..2d4ce66 100644 --- a/Tests/RunCMake/install/FILES-EXTRA_ISPC_TARGET_OBJECTS-all-check.cmake +++ b/Tests/RunCMake/install/FILES-EXTRA_ISPC_TARGET_OBJECTS-all-check.cmake @@ -1,6 +1,10 @@ set(objs obj1 obj2) -set(targets sse2 sse4 avx avx2) +if("${CMAKE_SYSTEM_NAME};${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "Darwin;arm64") + set(targets "") +else() + set(targets sse2 sse4 avx avx2) +endif() foreach(o IN LISTS objs) set(item "objs/${o}\\.ispc\\.(o|obj)") check_installed("${item}") diff --git a/Tests/RunCMake/install/FILES-EXTRA_ISPC_TARGET_OBJECTS.cmake b/Tests/RunCMake/install/FILES-EXTRA_ISPC_TARGET_OBJECTS.cmake index ad542ed..91ed458 100644 --- a/Tests/RunCMake/install/FILES-EXTRA_ISPC_TARGET_OBJECTS.cmake +++ b/Tests/RunCMake/install/FILES-EXTRA_ISPC_TARGET_OBJECTS.cmake @@ -1,4 +1,8 @@ enable_language(ISPC) add_library(objs OBJECT obj1.ispc obj2.ispc) -set_target_properties(objs PROPERTIES ISPC_INSTRUCTION_SETS "sse2-i32x4;sse4-i16x8;avx1-i32x16;avx2-i32x4") +if("${CMAKE_SYSTEM_NAME};${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "Darwin;arm64") + set_property(TARGET objs PROPERTY ISPC_INSTRUCTION_SETS "neon-i32x4") +else() + set_property(TARGET objs PROPERTY ISPC_INSTRUCTION_SETS "sse2-i32x4;sse4-i16x8;avx1-i32x16;avx2-i32x4") +endif() install(FILES $ DESTINATION objs) -- cgit v0.12 From 5210b98ec276d4bb6e5dc2b7cca9abe84029cf69 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 9 May 2023 11:51:37 -0400 Subject: gitlab-ci: Move macOS Ninja Multi-Config nightly job to arm64 architecture --- .gitlab-ci.yml | 10 +++++----- .gitlab/ci/configure_macos_arm64_ninja_multi.cmake | 6 ++++++ .gitlab/ci/configure_macos_x86_64_ninja_multi.cmake | 6 ------ .gitlab/ci/env_macos_arm64_ninja_multi.sh | 3 +++ .gitlab/ci/env_macos_x86_64_ninja_multi.sh | 3 --- .gitlab/os-macos.yml | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 .gitlab/ci/configure_macos_arm64_ninja_multi.cmake delete mode 100644 .gitlab/ci/configure_macos_x86_64_ninja_multi.cmake create mode 100644 .gitlab/ci/env_macos_arm64_ninja_multi.sh delete mode 100644 .gitlab/ci/env_macos_x86_64_ninja_multi.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 700e436..82abb44 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -884,17 +884,17 @@ t:macos-x86_64-makefiles: needs: - b:macos-x86_64-makefiles -t:macos-x86_64-ninja-multi: +t:macos-arm64-ninja-multi: extends: - - .macos_x86_64_ninja_multi + - .macos_arm64_ninja_multi - .cmake_test_macos_external - - .macos_x86_64_tags_ext + - .macos_arm64_tags_ext - .cmake_junit_artifacts - .run_dependent dependencies: - - t:macos-x86_64-ninja + - t:macos-arm64-ninja needs: - - t:macos-x86_64-ninja + - t:macos-arm64-ninja variables: CMAKE_CI_JOB_NIGHTLY: "true" diff --git a/.gitlab/ci/configure_macos_arm64_ninja_multi.cmake b/.gitlab/ci/configure_macos_arm64_ninja_multi.cmake new file mode 100644 index 0000000..b22285c --- /dev/null +++ b/.gitlab/ci/configure_macos_arm64_ninja_multi.cmake @@ -0,0 +1,6 @@ +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMake_TEST_ISPC "ON" CACHE STRING "") +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_macos_x86_64_ninja_multi.cmake b/.gitlab/ci/configure_macos_x86_64_ninja_multi.cmake deleted file mode 100644 index b22285c..0000000 --- a/.gitlab/ci/configure_macos_x86_64_ninja_multi.cmake +++ /dev/null @@ -1,6 +0,0 @@ -if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") - set(CMake_TEST_ISPC "ON" CACHE STRING "") -endif() - -include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/env_macos_arm64_ninja_multi.sh b/.gitlab/ci/env_macos_arm64_ninja_multi.sh new file mode 100644 index 0000000..217ff30 --- /dev/null +++ b/.gitlab/ci/env_macos_arm64_ninja_multi.sh @@ -0,0 +1,3 @@ +if test "$CMAKE_CI_NIGHTLY" = "true"; then + source .gitlab/ci/ispc-env.sh +fi diff --git a/.gitlab/ci/env_macos_x86_64_ninja_multi.sh b/.gitlab/ci/env_macos_x86_64_ninja_multi.sh deleted file mode 100644 index 217ff30..0000000 --- a/.gitlab/ci/env_macos_x86_64_ninja_multi.sh +++ /dev/null @@ -1,3 +0,0 @@ -if test "$CMAKE_CI_NIGHTLY" = "true"; then - source .gitlab/ci/ispc-env.sh -fi diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index f6fea3d..3e11fd1 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -88,11 +88,11 @@ CMAKE_GENERATOR: Xcode CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" -.macos_x86_64_ninja_multi: +.macos_arm64_ninja_multi: extends: .macos variables: - CMAKE_CONFIGURATION: macos_x86_64_ninja_multi + CMAKE_CONFIGURATION: macos_arm64_ninja_multi CMAKE_GENERATOR: "Ninja Multi-Config" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" -- cgit v0.12 From 3a20a5f149a50c219f341a9623815443220a8b52 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 9 May 2023 11:19:50 -0400 Subject: gitlab-ci: Move macOS+Xcode universal binaries job to arm64 Over time we are adding `arm64` hosts and removing `x86_64` hosts. --- .gitlab-ci.yml | 10 +++++----- .gitlab/ci/configure_macos_arm64_xcode_ub.cmake | 2 ++ .gitlab/ci/configure_macos_x86_64_xcode_ub.cmake | 2 -- .gitlab/ci/env_macos_arm64_xcode_ub.cmake | 1 + .gitlab/ci/env_macos_x86_64_xcode_ub.cmake | 1 - .gitlab/os-macos.yml | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 .gitlab/ci/configure_macos_arm64_xcode_ub.cmake delete mode 100644 .gitlab/ci/configure_macos_x86_64_xcode_ub.cmake create mode 100644 .gitlab/ci/env_macos_arm64_xcode_ub.cmake delete mode 100644 .gitlab/ci/env_macos_x86_64_xcode_ub.cmake diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82abb44..305c8d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -938,17 +938,17 @@ t:macos-x86_64-ninja-ub: variables: CMAKE_CI_JOB_NIGHTLY: "true" -t:macos-x86_64-xcode-ub: +t:macos-arm64-xcode-ub: extends: - - .macos_x86_64_xcode_ub + - .macos_arm64_xcode_ub - .cmake_test_macos_external - - .macos_x86_64_tags_ext + - .macos_arm64_tags_ext - .cmake_junit_artifacts - .run_dependent dependencies: - - t:macos-x86_64-ninja + - t:macos-arm64-ninja needs: - - t:macos-x86_64-ninja + - t:macos-arm64-ninja variables: CMAKE_CI_JOB_NIGHTLY: "true" diff --git a/.gitlab/ci/configure_macos_arm64_xcode_ub.cmake b/.gitlab/ci/configure_macos_arm64_xcode_ub.cmake new file mode 100644 index 0000000..1b976d2 --- /dev/null +++ b/.gitlab/ci/configure_macos_arm64_xcode_ub.cmake @@ -0,0 +1,2 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_macos_x86_64_xcode_ub.cmake b/.gitlab/ci/configure_macos_x86_64_xcode_ub.cmake deleted file mode 100644 index 1b976d2..0000000 --- a/.gitlab/ci/configure_macos_x86_64_xcode_ub.cmake +++ /dev/null @@ -1,2 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/env_macos_arm64_xcode_ub.cmake b/.gitlab/ci/env_macos_arm64_xcode_ub.cmake new file mode 100644 index 0000000..244f088 --- /dev/null +++ b/.gitlab/ci/env_macos_arm64_xcode_ub.cmake @@ -0,0 +1 @@ +set(ENV{CMAKE_OSX_ARCHITECTURES} "arm64;x86_64") diff --git a/.gitlab/ci/env_macos_x86_64_xcode_ub.cmake b/.gitlab/ci/env_macos_x86_64_xcode_ub.cmake deleted file mode 100644 index 4b5c401..0000000 --- a/.gitlab/ci/env_macos_x86_64_xcode_ub.cmake +++ /dev/null @@ -1 +0,0 @@ -set(ENV{CMAKE_OSX_ARCHITECTURES} "x86_64;arm64") diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 3e11fd1..1579338 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -80,11 +80,11 @@ CMAKE_GENERATOR: Xcode CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" -.macos_x86_64_xcode_ub: +.macos_arm64_xcode_ub: extends: .macos variables: - CMAKE_CONFIGURATION: macos_x86_64_xcode_ub + CMAKE_CONFIGURATION: macos_arm64_xcode_ub CMAKE_GENERATOR: Xcode CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" -- cgit v0.12