use clang 16

correaa · Dec 19, 2024 · 5cbc489 · 5cbc489
1 parent 74166cf
commit 5cbc489
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -208,7 +208,7 @@ clang++:
     - cmake --build . --parallel 2 || cmake --build . --parallel 1 --verbose
     - ctest -j 2 --output-on-failure
 
-clang++ mull:
+clang++-16 mull-16:  # mull-17 crashes
   image: ubuntu:24.04
   stage: build
   tags:
@@ -218,22 +218,22 @@ clang++ mull:
   allow_failure: true
   script:
     - apt-get -qq update
-    - apt-get -qq install --no-install-recommends -y --quiet gnupg curl wget ca-certificates clang-17 libclang-rt-17-dev make libboost-timer-dev libboost-serialization-dev libblas-dev libfftw3-dev liblapack-dev pkg-config
-    - wget --no-verbose -O cmake-install.sh https://github.com/Kitware/CMake/releases/download/v3.30.0-rc4/cmake-3.30.0-rc4-linux-`arch`.sh # for CMAKE_TEST_LAUNCHER
-    - sh cmake-install.sh --skip-license --prefix=/usr
-    - cmake --version
+    - apt-get -qq install --no-install-recommends -y --quiet gnupg curl wget ca-certificates clang-16 libclang-rt-16-dev make libboost-timer-dev libboost-serialization-dev libblas-dev libfftw3-dev liblapack-dev pkg-config
+    # - wget --no-verbose -O cmake-install.sh https://github.com/Kitware/CMake/releases/download/v3.30.0-rc4/cmake-3.30.0-rc4-linux-`arch`.sh # for CMAKE_TEST_LAUNCHER
+    # - sh cmake-install.sh --skip-license --prefix=/usr
+    # - cmake --version
     - curl -1sLf 'https://dl.cloudsmith.io/public/mull-project/mull-stable/setup.deb.sh' | bash
-    - clang++-17 --version
+    - clang++-16 --version
     - apt-get -qq update
     - apt search mull
-    - apt-get -qq install --no-install-recommends -y --quiet mull-17 libclang-cpp17
+    - apt-get -qq install --no-install-recommends -y --quiet mull-16 libclang-cpp16
     - mkdir build && cd build
-    - mull-runner-17 --version
-    - CXX=clang++-17 cmake .. -DCMAKE_CXX_FLAGS="-O1 -fpass-plugin=/usr/lib/mull-ir-frontend-17 -g -grecord-command-line -fprofile-instr-generate -fcoverage-mapping"
+    - mull-runner-16 --version
+    - CXX=clang++-16 cmake .. -DCMAKE_CXX_FLAGS="-O1 -fpass-plugin=/usr/lib/mull-ir-frontend-16 -g -grecord-command-line -fprofile-instr-generate -fcoverage-mapping"
     - cmake --build . --parallel 2 || cmake --build . --parallel 1 --verbose
     - ctest -j 2 --output-on-failure --verbose
     - cd test
-    - ls *.x | xargs -n 1 sh -c 'echo $0 && ((mull-runner-17 --ld-search-path=/usr/lib/x86_64-linux-gnu $0 -test-program=ctest -- -j2 --stop-on-failure) || exit 255)'
+    - ls *.x | xargs -n 1 sh -c 'echo $0 && ((mull-runner-16 --ld-search-path=/usr/lib/x86_64-linux-gnu $0 -test-program=ctest -- -j2 --stop-on-failure) || exit 255)'
   needs: ["clang++"]
 
 # deb:

diff --git a/Testing/Temporary/LastTest.log b/Testing/Temporary/LastTest.log
@@ -0,0 +1,3 @@
+Start testing: Dec 18 22:26 PST
+----------------------------------------------------------
+End testing: Dec 18 22:26 PST
diff --git a/pre-push b/pre-push
@@ -35,8 +35,8 @@ if [[ $(uname -m) != 'arm64' ]]; then
 export VALGRIND_EXE="valgrind --trace-children=yes --leak-check=full --track-origins=yes --show-leak-kinds=all --suppressions=.valgrind_suppressions --gen-suppressions=all --error-exitcode=1 "
 
  (mkdir -p .build.g++           && cd .build.g++           && CXX=g++                                                       cmake .. -DCMAKE_BUILD_TYPE=Debug   -DCMAKE_EXPORT_COMPILE_COMMANDS=ON                                                                                                                       && cmake --build . && ctest --parallel 2 --output-on-failure) || exit 666
- (mkdir -p .build.clang++.mull  && cd .build.clang++.mull  && CXX=clang++-14                                                cmake ..                            -DCMAKE_CXX_FLAGS="-O1 -fpass-plugin=/usr/lib/mull-ir-frontend-14 -g -grecord-command-line -fprofile-instr-generate -fcoverage-mapping" -DCMAKE_TEST_LAUNCHER="mull-runner-14;--strict;--ld-search-path=/usr/lib/x86_64-linux-gnu" && cmake --build . && (ls test/*.x | xargs -n 1 sh -c 'echo $0 && ((mull-runner-14 $0 -test-program=ctest -- -j2 --stop-on-failure) || exit 255)') ) || exit 666
- (mkdir -p .build.circle        && cd .build.circle        && CXX="$HOME/bin/circle"                                        cmake .. -DCMAKE_BUILD_TYPE=Debug   -DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_STANDARD=20 -DDISABLE_MPI=1 -DENABLE_CIRCLE=1 -DCMAKE_THREAD_LIBS_INIT="-lpthread"                                                                     && cmake --build . && ctest --parallel --output-on-failure --rerun-failed) || exit 666
+ (mkdir -p .build.clang++.mull  && cd .build.clang++.mull  && CXX=clang++-16                                                cmake ..                            -DCMAKE_CXX_FLAGS="-O1 -fpass-plugin=/usr/lib/mull-ir-frontend-16 -g -grecord-command-line -fprofile-instr-generate -fcoverage-mapping"                   && cmake --build . && (ls test/*.x | xargs -n 1 sh -c 'echo $0 && ((mull-runner-16 $0 -test-program=ctest -- -j2 --stop-on-failure) || exit 255)') ) || exit 666
+ (mkdir -p .build.circle        && cd .build.circle        && CXX="$HOME/bin/circle"                                        cmake .. -DCMAKE_BUILD_TYPE=Debug   -DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_STANDARD=20 -DDISABLE_MPI=1 -DENABLE_CIRCLE=1 -DCMAKE_THREAD_LIBS_INIT="-lpthread"                                && cmake --build . && ctest --parallel --output-on-failure --rerun-failed) || exit 666
  (mkdir -p .build.clang++-rel   && cd .build.clang++-rel   && CXX=clang++                                                   cmake .. -DCMAKE_BUILD_TYPE=Release                                                                                                                                                          && cmake --build . && ctest --parallel 2 --output-on-failure) || exit 666
  (mkdir -p .build.clang++       && cd .build.clang++       && CXX=clang++                                                   cmake .. -DCMAKE_BUILD_TYPE=Debug                                                                                                                                                            && cmake --build . && ctest --parallel 2 --output-on-failure) || exit 666
  (mkdir -p .build.g++-rel       && cd .build.g++-rel       && CXX=g++                                                       cmake .. -DCMAKE_BUILD_TYPE=Release                                                                                                                       && cmake --build . && ctest --parallel --output-on-failure --rerun-failed) || exit 666

diff --git a/test/pmr.cpp b/test/pmr.cpp
@@ -122,6 +122,9 @@ auto main() -> int {  // NOLINT(readability-function-cognitive-complexity,bugpro
 			}
 		);
 
+		std::cout << acc << std::endl;
+		BOOST_TEST( acc == 49998575 );
+
 		auto time = std::chrono::high_resolution_clock::now() - start_time;
 		std::cout << time.count() / count << "          " << acc << '\n';
 	}