Merge branch 'more-mull' into 'master'

more-mull See merge request correaa/boost-multi!1296
correaa · Dec 21, 2024 · 06e6ca8 · 06e6ca8
2 parents d43a609 + cb43748
commit 06e6ca8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -215,7 +215,7 @@ clang++-16 mull-16:  # mull-17 crashes
     - x86_64  # for mull
     - non-shared
   interruptible: true
-  allow_failure: true
+  allow_failure: false
   script:
     - apt-get -qq update
     - apt-get -qq install --no-install-recommends -y --quiet gnupg curl wget ca-certificates clang-16 cmake libclang-rt-16-dev make libboost-timer-dev libboost-serialization-dev libblas-dev libfftw3-dev liblapack-dev pkg-config
@@ -228,7 +228,7 @@ clang++-16 mull-16:  # mull-17 crashes
     - 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
+    - ctest -j 2 --output-on-failure
     - cd test
     - 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++"]

diff --git a/mull.yml b/mull.yml
@@ -4,9 +4,10 @@ mutators:
  - cxx_and_assign_to_or_assign  # Replaces &= with |=
  - cxx_and_to_or  # Replaces & with |
  - cxx_assign_const  # Replaces `a = b` with `a = 42`
+ - cxx_bitwise_not_to_noop  # Replaces ~x with x
  - cxx_mul_to_div  # Replaces / with *
  - cxx_lt_to_le  # Replaces < with <=
 timeout: 10000 # in milliseconds
 quiet: true # additional logging?
-# excludePaths:
-#   - test*
+excludePaths:
+  - .*test.*
diff --git a/pre-push b/pre-push
@@ -35,7 +35,7 @@ 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++-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.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 --ld-search-path /usr/lib --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

diff --git a/test/pmr.cpp b/test/pmr.cpp
@@ -122,7 +122,6 @@ 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;
-Original file line number
+Diff line change
@@ Expand Up @@
     			}
     		);
-    		std::cout << acc << std::endl;
     		BOOST_TEST( acc == 49998575 );
     		auto time = std::chrono::high_resolution_clock::now() - start_time;
@@ Expand Down @@