From ab2673beb2f474a87facce41c971ceb9e5aa2eb3 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Fri, 7 Jun 2024 21:10:19 +0200 Subject: [PATCH 01/10] Fix performance-noexcept-move-constructor clang-tidy warning --- .clang-tidy | 1 - 1 file changed, 1 deletion(-) diff --git a/.clang-tidy b/.clang-tidy index bf42711fb59..0c60e12ef25 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -58,7 +58,6 @@ Checks: > modernize-concat-nested-namespaces, modernize-use-using, performance-*, - -performance-noexcept-move-constructor, -performance-no-int-to-ptr, -performance-enum-size, -performance-avoid-endl, From db4bfe59238b6650e4cc9ba917631786142d14b3 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Fri, 7 Jun 2024 21:10:53 +0200 Subject: [PATCH 02/10] Fix performance-noexcept-move-constructor clang-tidy warning --- .github/workflows/osrm-backend.yml | 740 ++++++++++++++--------------- 1 file changed, 370 insertions(+), 370 deletions(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index e787b31c6eb..906aff93747 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -23,140 +23,140 @@ concurrency: cancel-in-progress: true jobs: - windows-release-node: - needs: format-taginfo-docs - runs-on: windows-2022 - continue-on-error: false - env: - BUILD_TYPE: Release - steps: - - uses: actions/checkout@v4 - - run: pip install "conan<2.0.0" - - run: conan --version - - run: cmake --version - - uses: actions/setup-node@v4 - with: - node-version: 18 - - run: node --version - - run: npm --version - - name: Prepare environment - shell: bash - run: | - PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)") - echo PUBLISH=$([[ "${GITHUB_REF:-}" == "refs/tags/v${PACKAGE_JSON_VERSION}" ]] && echo "On" || echo "Off") >> $GITHUB_ENV - - run: npm install --ignore-scripts - - run: npm link --ignore-scripts - - uses: microsoft/setup-msbuild@v2 - - name: Build - run: | - .\scripts\ci\windows-build.bat - - name: Run node tests - shell: bash - run: | - ./lib/binding/osrm-datastore.exe test/data/ch/monaco.osrm - node test/nodejs/index.js - - name: Build Node package - shell: bash - run: ./scripts/ci/node_package.sh - - name: Publish Node package - if: ${{ env.PUBLISH == 'On' }} - uses: ncipollo/release-action@v1 - with: - allowUpdates: true - artifactErrorsFailBuild: true - artifacts: build/stage/**/*.tar.gz - omitBody: true - omitBodyDuringUpdate: true - omitName: true - omitNameDuringUpdate: true - replacesArtifacts: true - token: ${{ secrets.GITHUB_TOKEN }} - - format-taginfo-docs: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - name: Use Node.js - uses: actions/setup-node@v4 - with: - node-version: 18 - - name: Enable Node.js cache - uses: actions/cache@v4 - with: - path: ~/.npm - key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-node- - - name: Prepare environment - run: | - npm ci --ignore-scripts - clang-format-15 --version - - name: Run checks - run: | - ./scripts/check_taginfo.py taginfo.json profiles/car.lua - ./scripts/format.sh && ./scripts/error_on_dirty.sh - node ./scripts/validate_changelog.js - npm run docs && ./scripts/error_on_dirty.sh - npm audit --production - - docker-image: - needs: format-taginfo-docs - runs-on: ubuntu-22.04 - continue-on-error: false - steps: - - name: Check out the repo - uses: actions/checkout@v4 - - name: Enable osm.pbf cache - uses: actions/cache@v4 - with: - path: berlin-latest.osm.pbf - key: v1-berlin-osm-pbf - restore-keys: | - v1-berlin-osm-pbf - - name: Docker build - run: | - docker build -t osrm-backend-local -f docker/Dockerfile . - - name: Test Docker image - run: | - if [ ! -f "${PWD}/berlin-latest.osm.pbf" ]; then - wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf - fi - TAG=osrm-backend-local - # when `--memory-swap` value equals `--memory` it means container won't use swap - # see https://docs.docker.com/config/containers/resource_constraints/#--memory-swap-details - MEMORY_ARGS="--memory=1g --memory-swap=1g" - docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-extract --dump-nbg-graph -p /opt/car.lua /data/berlin-latest.osm.pbf - docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-components /data/berlin-latest.osrm.nbg /data/berlin-latest.geojson - if [ ! -s "${PWD}/berlin-latest.geojson" ] - then - >&2 echo "No berlin-latest.geojson found" - exit 1 - fi - - # removing `.osrm.nbg` to check that whole pipeline works without it - rm -rf "${PWD}/berlin-latest.osrm.nbg" - - docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-partition /data/berlin-latest.osrm - docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-customize /data/berlin-latest.osrm - docker run $MEMORY_ARGS --name=osrm-container -t -p 5000:5000 -v "${PWD}:/data" "${TAG}" osrm-routed --algorithm mld /data/berlin-latest.osrm & - curl --retry-delay 3 --retry 10 --retry-all-errors "http://127.0.0.1:5000/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true" - docker stop osrm-container + # windows-release-node: + # needs: format-taginfo-docs + # runs-on: windows-2022 + # continue-on-error: false + # env: + # BUILD_TYPE: Release + # steps: + # - uses: actions/checkout@v4 + # - run: pip install "conan<2.0.0" + # - run: conan --version + # - run: cmake --version + # - uses: actions/setup-node@v4 + # with: + # node-version: 18 + # - run: node --version + # - run: npm --version + # - name: Prepare environment + # shell: bash + # run: | + # PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)") + # echo PUBLISH=$([[ "${GITHUB_REF:-}" == "refs/tags/v${PACKAGE_JSON_VERSION}" ]] && echo "On" || echo "Off") >> $GITHUB_ENV + # - run: npm install --ignore-scripts + # - run: npm link --ignore-scripts + # - uses: microsoft/setup-msbuild@v2 + # - name: Build + # run: | + # .\scripts\ci\windows-build.bat + # - name: Run node tests + # shell: bash + # run: | + # ./lib/binding/osrm-datastore.exe test/data/ch/monaco.osrm + # node test/nodejs/index.js + # - name: Build Node package + # shell: bash + # run: ./scripts/ci/node_package.sh + # - name: Publish Node package + # if: ${{ env.PUBLISH == 'On' }} + # uses: ncipollo/release-action@v1 + # with: + # allowUpdates: true + # artifactErrorsFailBuild: true + # artifacts: build/stage/**/*.tar.gz + # omitBody: true + # omitBodyDuringUpdate: true + # omitName: true + # omitNameDuringUpdate: true + # replacesArtifacts: true + # token: ${{ secrets.GITHUB_TOKEN }} + + # format-taginfo-docs: + # runs-on: ubuntu-22.04 + # steps: + # - uses: actions/checkout@v4 + # - name: Use Node.js + # uses: actions/setup-node@v4 + # with: + # node-version: 18 + # - name: Enable Node.js cache + # uses: actions/cache@v4 + # with: + # path: ~/.npm + # key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + # restore-keys: | + # ${{ runner.os }}-node- + # - name: Prepare environment + # run: | + # npm ci --ignore-scripts + # clang-format-15 --version + # - name: Run checks + # run: | + # ./scripts/check_taginfo.py taginfo.json profiles/car.lua + # ./scripts/format.sh && ./scripts/error_on_dirty.sh + # node ./scripts/validate_changelog.js + # npm run docs && ./scripts/error_on_dirty.sh + # npm audit --production + + # docker-image: + # needs: format-taginfo-docs + # runs-on: ubuntu-22.04 + # continue-on-error: false + # steps: + # - name: Check out the repo + # uses: actions/checkout@v4 + # - name: Enable osm.pbf cache + # uses: actions/cache@v4 + # with: + # path: berlin-latest.osm.pbf + # key: v1-berlin-osm-pbf + # restore-keys: | + # v1-berlin-osm-pbf + # - name: Docker build + # run: | + # docker build -t osrm-backend-local -f docker/Dockerfile . + # - name: Test Docker image + # run: | + # if [ ! -f "${PWD}/berlin-latest.osm.pbf" ]; then + # wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf + # fi + # TAG=osrm-backend-local + # # when `--memory-swap` value equals `--memory` it means container won't use swap + # # see https://docs.docker.com/config/containers/resource_constraints/#--memory-swap-details + # MEMORY_ARGS="--memory=1g --memory-swap=1g" + # docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-extract --dump-nbg-graph -p /opt/car.lua /data/berlin-latest.osm.pbf + # docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-components /data/berlin-latest.osrm.nbg /data/berlin-latest.geojson + # if [ ! -s "${PWD}/berlin-latest.geojson" ] + # then + # >&2 echo "No berlin-latest.geojson found" + # exit 1 + # fi + + # # removing `.osrm.nbg` to check that whole pipeline works without it + # rm -rf "${PWD}/berlin-latest.osrm.nbg" + + # docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-partition /data/berlin-latest.osrm + # docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-customize /data/berlin-latest.osrm + # docker run $MEMORY_ARGS --name=osrm-container -t -p 5000:5000 -v "${PWD}:/data" "${TAG}" osrm-routed --algorithm mld /data/berlin-latest.osrm & + # curl --retry-delay 3 --retry 10 --retry-all-errors "http://127.0.0.1:5000/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true" + # docker stop osrm-container build-test-publish: - needs: format-taginfo-docs + # needs: format-taginfo-docs strategy: matrix: include: - - name: gcc-13-debug-cov - continue-on-error: false - node: 20 - runs-on: ubuntu-24.04 - BUILD_TOOLS: ON - BUILD_TYPE: Debug - CCOMPILER: gcc-13 - CUCUMBER_TIMEOUT: 20000 - CXXCOMPILER: g++-13 - ENABLE_COVERAGE: ON + # - name: gcc-13-debug-cov + # continue-on-error: false + # node: 20 + # runs-on: ubuntu-24.04 + # BUILD_TOOLS: ON + # BUILD_TYPE: Debug + # CCOMPILER: gcc-13 + # CUCUMBER_TIMEOUT: 20000 + # CXXCOMPILER: g++-13 + # ENABLE_COVERAGE: ON - name: clang-15-debug-asan-ubsan continue-on-error: false @@ -172,153 +172,153 @@ jobs: OSRM_CONNECTION_RETRIES: 10 OSRM_CONNECTION_EXP_BACKOFF_COEF: 1.5 - - name: clang-15-release - continue-on-error: false - node: 18 - runs-on: ubuntu-22.04 - BUILD_TOOLS: ON - BUILD_TYPE: Release - CCOMPILER: clang-15 - CXXCOMPILER: clang++-15 - CUCUMBER_TIMEOUT: 60000 - - - name: clang-15-debug - continue-on-error: false - node: 18 - runs-on: ubuntu-22.04 - BUILD_TOOLS: ON - BUILD_TYPE: Debug - CCOMPILER: clang-15 - CXXCOMPILER: clang++-15 - CUCUMBER_TIMEOUT: 60000 - - - name: clang-18-debug-clang-tidy - continue-on-error: false - node: 18 - runs-on: ubuntu-24.04 - BUILD_TOOLS: ON - BUILD_TYPE: Debug - CCOMPILER: clang-18 - CXXCOMPILER: clang++-18 - CUCUMBER_TIMEOUT: 60000 - ENABLE_CLANG_TIDY: ON - - - name: clang-14-release - continue-on-error: false - node: 18 - runs-on: ubuntu-22.04 - BUILD_TOOLS: ON - BUILD_TYPE: Release - CCOMPILER: clang-14 - CXXCOMPILER: clang++-14 - CUCUMBER_TIMEOUT: 60000 - - - name: clang-13-release - continue-on-error: false - node: 18 - runs-on: ubuntu-22.04 - BUILD_TOOLS: ON - BUILD_TYPE: Release - CCOMPILER: clang-13 - CXXCOMPILER: clang++-13 - CUCUMBER_TIMEOUT: 60000 - - - name: conan-linux-debug-asan-ubsan - continue-on-error: false - node: 18 - runs-on: ubuntu-22.04 - BUILD_TOOLS: ON - BUILD_TYPE: Release - CCOMPILER: clang-15 - CXXCOMPILER: clang++-15 - ENABLE_CONAN: ON - ENABLE_SANITIZER: ON - - - name: conan-linux-release - continue-on-error: false - node: 18 - runs-on: ubuntu-22.04 - BUILD_TOOLS: ON - BUILD_TYPE: Release - CCOMPILER: clang-15 - CXXCOMPILER: clang++-15 - ENABLE_CONAN: ON - - - name: gcc-14-release - continue-on-error: false - node: 20 - runs-on: ubuntu-24.04 - BUILD_TOOLS: ON - BUILD_TYPE: Release - CCOMPILER: gcc-14 - CXXCOMPILER: g++-14 - CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized' - - - name: gcc-13-release - continue-on-error: false - node: 20 - runs-on: ubuntu-24.04 - BUILD_TOOLS: ON - BUILD_TYPE: Release - CCOMPILER: gcc-13 - CXXCOMPILER: g++-13 - CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized' - - - name: gcc-12-release - continue-on-error: false - node: 20 - runs-on: ubuntu-22.04 - BUILD_TOOLS: ON - BUILD_TYPE: Release - CCOMPILER: gcc-12 - CXXCOMPILER: g++-12 - CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized' - - - name: conan-linux-release-node - build_node_package: true - continue-on-error: false - node: 20 - runs-on: ubuntu-22.04 - BUILD_TYPE: Release - CCOMPILER: clang-13 - CXXCOMPILER: clang++-13 - ENABLE_CONAN: ON - NODE_PACKAGE_TESTS_ONLY: ON - - - name: conan-linux-debug-node - build_node_package: true - continue-on-error: false - node: 20 - runs-on: ubuntu-22.04 - BUILD_TYPE: Debug - CCOMPILER: clang-13 - CXXCOMPILER: clang++-13 - ENABLE_CONAN: ON - NODE_PACKAGE_TESTS_ONLY: ON - - - name: conan-macos-x64-release-node - build_node_package: true - continue-on-error: true - node: 20 - runs-on: macos-13 # x86_64 - BUILD_TYPE: Release - CCOMPILER: clang - CXXCOMPILER: clang++ - CUCUMBER_TIMEOUT: 60000 - ENABLE_ASSERTIONS: ON - ENABLE_CONAN: ON - - - name: conan-macos-arm64-release-node - build_node_package: true - continue-on-error: true - node: 20 - runs-on: macos-14 # arm64 - BUILD_TYPE: Release - CCOMPILER: clang - CXXCOMPILER: clang++ - CUCUMBER_TIMEOUT: 60000 - ENABLE_ASSERTIONS: ON - ENABLE_CONAN: ON + # - name: clang-15-release + # continue-on-error: false + # node: 18 + # runs-on: ubuntu-22.04 + # BUILD_TOOLS: ON + # BUILD_TYPE: Release + # CCOMPILER: clang-15 + # CXXCOMPILER: clang++-15 + # CUCUMBER_TIMEOUT: 60000 + + # - name: clang-15-debug + # continue-on-error: false + # node: 18 + # runs-on: ubuntu-22.04 + # BUILD_TOOLS: ON + # BUILD_TYPE: Debug + # CCOMPILER: clang-15 + # CXXCOMPILER: clang++-15 + # CUCUMBER_TIMEOUT: 60000 + + # - name: clang-18-debug-clang-tidy + # continue-on-error: false + # node: 18 + # runs-on: ubuntu-24.04 + # BUILD_TOOLS: ON + # BUILD_TYPE: Debug + # CCOMPILER: clang-18 + # CXXCOMPILER: clang++-18 + # CUCUMBER_TIMEOUT: 60000 + # ENABLE_CLANG_TIDY: ON + + # - name: clang-14-release + # continue-on-error: false + # node: 18 + # runs-on: ubuntu-22.04 + # BUILD_TOOLS: ON + # BUILD_TYPE: Release + # CCOMPILER: clang-14 + # CXXCOMPILER: clang++-14 + # CUCUMBER_TIMEOUT: 60000 + + # - name: clang-13-release + # continue-on-error: false + # node: 18 + # runs-on: ubuntu-22.04 + # BUILD_TOOLS: ON + # BUILD_TYPE: Release + # CCOMPILER: clang-13 + # CXXCOMPILER: clang++-13 + # CUCUMBER_TIMEOUT: 60000 + + # - name: conan-linux-debug-asan-ubsan + # continue-on-error: false + # node: 18 + # runs-on: ubuntu-22.04 + # BUILD_TOOLS: ON + # BUILD_TYPE: Release + # CCOMPILER: clang-15 + # CXXCOMPILER: clang++-15 + # ENABLE_CONAN: ON + # ENABLE_SANITIZER: ON + + # - name: conan-linux-release + # continue-on-error: false + # node: 18 + # runs-on: ubuntu-22.04 + # BUILD_TOOLS: ON + # BUILD_TYPE: Release + # CCOMPILER: clang-15 + # CXXCOMPILER: clang++-15 + # ENABLE_CONAN: ON + + # - name: gcc-14-release + # continue-on-error: false + # node: 20 + # runs-on: ubuntu-24.04 + # BUILD_TOOLS: ON + # BUILD_TYPE: Release + # CCOMPILER: gcc-14 + # CXXCOMPILER: g++-14 + # CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized' + + # - name: gcc-13-release + # continue-on-error: false + # node: 20 + # runs-on: ubuntu-24.04 + # BUILD_TOOLS: ON + # BUILD_TYPE: Release + # CCOMPILER: gcc-13 + # CXXCOMPILER: g++-13 + # CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized' + + # - name: gcc-12-release + # continue-on-error: false + # node: 20 + # runs-on: ubuntu-22.04 + # BUILD_TOOLS: ON + # BUILD_TYPE: Release + # CCOMPILER: gcc-12 + # CXXCOMPILER: g++-12 + # CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized' + + # - name: conan-linux-release-node + # build_node_package: true + # continue-on-error: false + # node: 20 + # runs-on: ubuntu-22.04 + # BUILD_TYPE: Release + # CCOMPILER: clang-13 + # CXXCOMPILER: clang++-13 + # ENABLE_CONAN: ON + # NODE_PACKAGE_TESTS_ONLY: ON + + # - name: conan-linux-debug-node + # build_node_package: true + # continue-on-error: false + # node: 20 + # runs-on: ubuntu-22.04 + # BUILD_TYPE: Debug + # CCOMPILER: clang-13 + # CXXCOMPILER: clang++-13 + # ENABLE_CONAN: ON + # NODE_PACKAGE_TESTS_ONLY: ON + + # - name: conan-macos-x64-release-node + # build_node_package: true + # continue-on-error: true + # node: 20 + # runs-on: macos-13 # x86_64 + # BUILD_TYPE: Release + # CCOMPILER: clang + # CXXCOMPILER: clang++ + # CUCUMBER_TIMEOUT: 60000 + # ENABLE_ASSERTIONS: ON + # ENABLE_CONAN: ON + + # - name: conan-macos-arm64-release-node + # build_node_package: true + # continue-on-error: true + # node: 20 + # runs-on: macos-14 # arm64 + # BUILD_TYPE: Release + # CCOMPILER: clang + # CXXCOMPILER: clang++ + # CUCUMBER_TIMEOUT: 60000 + # ENABLE_ASSERTIONS: ON + # ENABLE_CONAN: ON name: ${{ matrix.name}} continue-on-error: ${{ matrix.continue-on-error }} @@ -615,97 +615,97 @@ jobs: ccache -p ccache -s - benchmarks: - if: github.event_name == 'pull_request' - needs: [format-taginfo-docs] - runs-on: ubuntu-22.04 - env: - CCOMPILER: clang-13 - CXXCOMPILER: clang++-13 - CC: clang-13 - CXX: clang++-13 - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PR_NUMBER: ${{ github.event.pull_request.number }} - GITHUB_REPOSITORY: ${{ github.repository }} - steps: - - name: Enable data.osm.pbf cache - uses: actions/cache@v4 - with: - path: ~/data.osm.pbf - key: v1-data-osm-pbf - restore-keys: | - v1-data-osm-pbf - - name: Enable compiler cache - uses: actions/cache@v4 - with: - path: ~/.ccache - key: v1-ccache-benchmarks-${{ github.sha }} - restore-keys: | - v1-ccache-benchmarks- - - name: Enable Conan cache - uses: actions/cache@v4 - with: - path: ~/.conan - key: v1-conan-benchmarks-${{ github.sha }} - restore-keys: | - v1-conan-benchmarks- - - name: Checkout PR Branch - uses: actions/checkout@v4 - with: - ref: ${{ github.head_ref }} - path: pr - - name: Install dependencies - run: | - python3 -m pip install "conan<2.0.0" "requests==2.31.0" "locust==2.28.0" - sudo apt-get update -y && sudo apt-get install ccache - - name: Prepare data - run: | - if [ ! -f "~/data.osm.pbf" ]; then - wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf -O ~/data.osm.pbf - fi - gunzip -c ./pr/test/data/berlin_gps_traces.csv.gz > ~/gps_traces.csv - - name: Prepare environment - run: | - echo "CCACHE_DIR=$HOME/.ccache" >> $GITHUB_ENV - mkdir -p $HOME/.ccache - ccache --zero-stats - ccache --max-size=256M - - name: Build PR Branch - run: | - mkdir -p pr/build - cd pr/build - cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release .. - make -j$(nproc) - make -j$(nproc) benchmarks - cd .. - make -C test/data - - name: Checkout Base Branch - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.base.ref }} - path: base - - name: Build Base Branch - run: | - mkdir base/build - cd base/build - cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release .. - make -j$(nproc) - make -j$(nproc) benchmarks - cd .. - make -C test/data - - name: Run Benchmarks - run: | - ./pr/scripts/ci/run_benchmarks.sh base pr - - name: Post Benchmark Results - run: | - python3 pr/scripts/ci/post_benchmark_results.py base_results pr_results - - name: Show CCache statistics - run: | - ccache -p - ccache -s - - ci-complete: - runs-on: ubuntu-22.04 - needs: [build-test-publish, docker-image, windows-release-node, benchmarks] - steps: - - run: echo "CI complete" + # benchmarks: + # if: github.event_name == 'pull_request' + # needs: [format-taginfo-docs] + # runs-on: ubuntu-22.04 + # env: + # CCOMPILER: clang-13 + # CXXCOMPILER: clang++-13 + # CC: clang-13 + # CXX: clang++-13 + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # PR_NUMBER: ${{ github.event.pull_request.number }} + # GITHUB_REPOSITORY: ${{ github.repository }} + # steps: + # - name: Enable data.osm.pbf cache + # uses: actions/cache@v4 + # with: + # path: ~/data.osm.pbf + # key: v1-data-osm-pbf + # restore-keys: | + # v1-data-osm-pbf + # - name: Enable compiler cache + # uses: actions/cache@v4 + # with: + # path: ~/.ccache + # key: v1-ccache-benchmarks-${{ github.sha }} + # restore-keys: | + # v1-ccache-benchmarks- + # - name: Enable Conan cache + # uses: actions/cache@v4 + # with: + # path: ~/.conan + # key: v1-conan-benchmarks-${{ github.sha }} + # restore-keys: | + # v1-conan-benchmarks- + # - name: Checkout PR Branch + # uses: actions/checkout@v4 + # with: + # ref: ${{ github.head_ref }} + # path: pr + # - name: Install dependencies + # run: | + # python3 -m pip install "conan<2.0.0" "requests==2.31.0" "locust==2.28.0" + # sudo apt-get update -y && sudo apt-get install ccache + # - name: Prepare data + # run: | + # if [ ! -f "~/data.osm.pbf" ]; then + # wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf -O ~/data.osm.pbf + # fi + # gunzip -c ./pr/test/data/berlin_gps_traces.csv.gz > ~/gps_traces.csv + # - name: Prepare environment + # run: | + # echo "CCACHE_DIR=$HOME/.ccache" >> $GITHUB_ENV + # mkdir -p $HOME/.ccache + # ccache --zero-stats + # ccache --max-size=256M + # - name: Build PR Branch + # run: | + # mkdir -p pr/build + # cd pr/build + # cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release .. + # make -j$(nproc) + # make -j$(nproc) benchmarks + # cd .. + # make -C test/data + # - name: Checkout Base Branch + # uses: actions/checkout@v4 + # with: + # ref: ${{ github.event.pull_request.base.ref }} + # path: base + # - name: Build Base Branch + # run: | + # mkdir base/build + # cd base/build + # cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release .. + # make -j$(nproc) + # make -j$(nproc) benchmarks + # cd .. + # make -C test/data + # - name: Run Benchmarks + # run: | + # ./pr/scripts/ci/run_benchmarks.sh base pr + # - name: Post Benchmark Results + # run: | + # python3 pr/scripts/ci/post_benchmark_results.py base_results pr_results + # - name: Show CCache statistics + # run: | + # ccache -p + # ccache -s + + # ci-complete: + # runs-on: ubuntu-22.04 + # needs: [build-test-publish, docker-image, windows-release-node, benchmarks] + # steps: + # - run: echo "CI complete" From 7193e7010840e983d5e9557674aeab634b0da948 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Fri, 7 Jun 2024 21:12:42 +0200 Subject: [PATCH 03/10] wip --- .github/workflows/osrm-backend.yml | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 906aff93747..146cf803936 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -158,19 +158,19 @@ jobs: # CXXCOMPILER: g++-13 # ENABLE_COVERAGE: ON - - name: clang-15-debug-asan-ubsan - continue-on-error: false - node: 20 - runs-on: ubuntu-22.04 - BUILD_TOOLS: ON - BUILD_TYPE: Debug - CCOMPILER: clang-15 - CUCUMBER_TIMEOUT: 20000 - CXXCOMPILER: clang++-15 - ENABLE_SANITIZER: ON - TARGET_ARCH: x86_64-asan-ubsan - OSRM_CONNECTION_RETRIES: 10 - OSRM_CONNECTION_EXP_BACKOFF_COEF: 1.5 + # - name: clang-15-debug-asan-ubsan + # continue-on-error: false + # node: 20 + # runs-on: ubuntu-22.04 + # BUILD_TOOLS: ON + # BUILD_TYPE: Debug + # CCOMPILER: clang-15 + # CUCUMBER_TIMEOUT: 20000 + # CXXCOMPILER: clang++-15 + # ENABLE_SANITIZER: ON + # TARGET_ARCH: x86_64-asan-ubsan + # OSRM_CONNECTION_RETRIES: 10 + # OSRM_CONNECTION_EXP_BACKOFF_COEF: 1.5 # - name: clang-15-release # continue-on-error: false @@ -192,16 +192,16 @@ jobs: # CXXCOMPILER: clang++-15 # CUCUMBER_TIMEOUT: 60000 - # - name: clang-18-debug-clang-tidy - # continue-on-error: false - # node: 18 - # runs-on: ubuntu-24.04 - # BUILD_TOOLS: ON - # BUILD_TYPE: Debug - # CCOMPILER: clang-18 - # CXXCOMPILER: clang++-18 - # CUCUMBER_TIMEOUT: 60000 - # ENABLE_CLANG_TIDY: ON + - name: clang-18-debug-clang-tidy + continue-on-error: false + node: 18 + runs-on: ubuntu-24.04 + BUILD_TOOLS: ON + BUILD_TYPE: Debug + CCOMPILER: clang-18 + CXXCOMPILER: clang++-18 + CUCUMBER_TIMEOUT: 60000 + ENABLE_CLANG_TIDY: ON # - name: clang-14-release # continue-on-error: false From e1268d1eba62aef54672db9eea3dcb4656fcdb0a Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Fri, 7 Jun 2024 21:32:42 +0200 Subject: [PATCH 04/10] wip From 45878e32a68ca1892d1d7471101a8eb477467257 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Fri, 7 Jun 2024 21:34:25 +0200 Subject: [PATCH 05/10] wip --- include/util/concurrent_id_map.hpp | 4 ++-- include/util/deallocating_vector.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/util/concurrent_id_map.hpp b/include/util/concurrent_id_map.hpp index ac398725a6c..594f632e115 100644 --- a/include/util/concurrent_id_map.hpp +++ b/include/util/concurrent_id_map.hpp @@ -26,7 +26,7 @@ struct ConcurrentIDMap mutable UpgradableMutex mutex; ConcurrentIDMap() = default; - ConcurrentIDMap(ConcurrentIDMap &&other) + ConcurrentIDMap(ConcurrentIDMap &&other) noexcept { if (this != &other) { @@ -36,7 +36,7 @@ struct ConcurrentIDMap data = std::move(other.data); } } - ConcurrentIDMap &operator=(ConcurrentIDMap &&other) + ConcurrentIDMap &operator=(ConcurrentIDMap &&other) noexcept { if (this != &other) { diff --git a/include/util/deallocating_vector.hpp b/include/util/deallocating_vector.hpp index f1cb0033daa..32a21650d39 100644 --- a/include/util/deallocating_vector.hpp +++ b/include/util/deallocating_vector.hpp @@ -204,8 +204,8 @@ template class DeallocatingVector } // moving is fine - DeallocatingVector(DeallocatingVector &&other) { swap(other); } - DeallocatingVector &operator=(DeallocatingVector &&other) + DeallocatingVector(DeallocatingVector &&other) noexcept { swap(other); } + DeallocatingVector &operator=(DeallocatingVector &&other) noexcept { swap(other); return *this; From a6c8e2842958245d8831479268c53930cb0d3852 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Fri, 7 Jun 2024 21:40:12 +0200 Subject: [PATCH 06/10] wip --- include/util/dynamic_graph.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/util/dynamic_graph.hpp b/include/util/dynamic_graph.hpp index 9efbf1402ec..ce65fda745e 100644 --- a/include/util/dynamic_graph.hpp +++ b/include/util/dynamic_graph.hpp @@ -154,7 +154,7 @@ template class DynamicGraph return *this; } - DynamicGraph(DynamicGraph &&other) + DynamicGraph(DynamicGraph &&other) noexcept { number_of_nodes = other.number_of_nodes; // atomics can't be moved this is why we need an own constructor @@ -164,7 +164,7 @@ template class DynamicGraph edge_list = std::move(other.edge_list); } - DynamicGraph &operator=(DynamicGraph &&other) + DynamicGraph &operator=(DynamicGraph &&other) noexcept { number_of_nodes = other.number_of_nodes; // atomics can't be moved this is why we need an own constructor From f5d6c3282df55b41ce2aa3102f2328f426e266e4 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Fri, 7 Jun 2024 21:54:20 +0200 Subject: [PATCH 07/10] wip --- include/server/http/header.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/server/http/header.hpp b/include/server/http/header.hpp index 35d4fcc13d1..a6e9da85872 100644 --- a/include/server/http/header.hpp +++ b/include/server/http/header.hpp @@ -12,7 +12,7 @@ struct header // explicitly use default copy c'tor as adding move c'tor header &operator=(const header &other) = default; header(std::string name, std::string value) : name(std::move(name)), value(std::move(value)) {} - header(header &&other) : name(std::move(other.name)), value(std::move(other.value)) {} + header(header &&other) noexcept : name(std::move(other.name)), value(std::move(other.value)) {} void clear() { From 833b462d1629bdee137d3f847da88df0f318088b Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Fri, 7 Jun 2024 22:16:24 +0200 Subject: [PATCH 08/10] wip --- .github/workflows/osrm-backend.yml | 757 +++++++++++++++-------------- 1 file changed, 379 insertions(+), 378 deletions(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 146cf803936..96828d790ff 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -23,302 +23,302 @@ concurrency: cancel-in-progress: true jobs: - # windows-release-node: - # needs: format-taginfo-docs - # runs-on: windows-2022 - # continue-on-error: false - # env: - # BUILD_TYPE: Release - # steps: - # - uses: actions/checkout@v4 - # - run: pip install "conan<2.0.0" - # - run: conan --version - # - run: cmake --version - # - uses: actions/setup-node@v4 - # with: - # node-version: 18 - # - run: node --version - # - run: npm --version - # - name: Prepare environment - # shell: bash - # run: | - # PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)") - # echo PUBLISH=$([[ "${GITHUB_REF:-}" == "refs/tags/v${PACKAGE_JSON_VERSION}" ]] && echo "On" || echo "Off") >> $GITHUB_ENV - # - run: npm install --ignore-scripts - # - run: npm link --ignore-scripts - # - uses: microsoft/setup-msbuild@v2 - # - name: Build - # run: | - # .\scripts\ci\windows-build.bat - # - name: Run node tests - # shell: bash - # run: | - # ./lib/binding/osrm-datastore.exe test/data/ch/monaco.osrm - # node test/nodejs/index.js - # - name: Build Node package - # shell: bash - # run: ./scripts/ci/node_package.sh - # - name: Publish Node package - # if: ${{ env.PUBLISH == 'On' }} - # uses: ncipollo/release-action@v1 - # with: - # allowUpdates: true - # artifactErrorsFailBuild: true - # artifacts: build/stage/**/*.tar.gz - # omitBody: true - # omitBodyDuringUpdate: true - # omitName: true - # omitNameDuringUpdate: true - # replacesArtifacts: true - # token: ${{ secrets.GITHUB_TOKEN }} - - # format-taginfo-docs: - # runs-on: ubuntu-22.04 - # steps: - # - uses: actions/checkout@v4 - # - name: Use Node.js - # uses: actions/setup-node@v4 - # with: - # node-version: 18 - # - name: Enable Node.js cache - # uses: actions/cache@v4 - # with: - # path: ~/.npm - # key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} - # restore-keys: | - # ${{ runner.os }}-node- - # - name: Prepare environment - # run: | - # npm ci --ignore-scripts - # clang-format-15 --version - # - name: Run checks - # run: | - # ./scripts/check_taginfo.py taginfo.json profiles/car.lua - # ./scripts/format.sh && ./scripts/error_on_dirty.sh - # node ./scripts/validate_changelog.js - # npm run docs && ./scripts/error_on_dirty.sh - # npm audit --production - - # docker-image: - # needs: format-taginfo-docs - # runs-on: ubuntu-22.04 - # continue-on-error: false - # steps: - # - name: Check out the repo - # uses: actions/checkout@v4 - # - name: Enable osm.pbf cache - # uses: actions/cache@v4 - # with: - # path: berlin-latest.osm.pbf - # key: v1-berlin-osm-pbf - # restore-keys: | - # v1-berlin-osm-pbf - # - name: Docker build - # run: | - # docker build -t osrm-backend-local -f docker/Dockerfile . - # - name: Test Docker image - # run: | - # if [ ! -f "${PWD}/berlin-latest.osm.pbf" ]; then - # wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf - # fi - # TAG=osrm-backend-local - # # when `--memory-swap` value equals `--memory` it means container won't use swap - # # see https://docs.docker.com/config/containers/resource_constraints/#--memory-swap-details - # MEMORY_ARGS="--memory=1g --memory-swap=1g" - # docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-extract --dump-nbg-graph -p /opt/car.lua /data/berlin-latest.osm.pbf - # docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-components /data/berlin-latest.osrm.nbg /data/berlin-latest.geojson - # if [ ! -s "${PWD}/berlin-latest.geojson" ] - # then - # >&2 echo "No berlin-latest.geojson found" - # exit 1 - # fi - - # # removing `.osrm.nbg` to check that whole pipeline works without it - # rm -rf "${PWD}/berlin-latest.osrm.nbg" - - # docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-partition /data/berlin-latest.osrm - # docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-customize /data/berlin-latest.osrm - # docker run $MEMORY_ARGS --name=osrm-container -t -p 5000:5000 -v "${PWD}:/data" "${TAG}" osrm-routed --algorithm mld /data/berlin-latest.osrm & - # curl --retry-delay 3 --retry 10 --retry-all-errors "http://127.0.0.1:5000/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true" - # docker stop osrm-container + windows-release-node: + needs: format-taginfo-docs + runs-on: windows-2022 + continue-on-error: false + env: + BUILD_TYPE: Release + steps: + - uses: actions/checkout@v4 + - run: pip install "conan<2.0.0" + - run: conan --version + - run: cmake --version + - uses: actions/setup-node@v4 + with: + node-version: 18 + - run: node --version + - run: npm --version + - name: Prepare environment + shell: bash + run: | + PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)") + echo PUBLISH=$([[ "${GITHUB_REF:-}" == "refs/tags/v${PACKAGE_JSON_VERSION}" ]] && echo "On" || echo "Off") >> $GITHUB_ENV + - run: npm install --ignore-scripts + - run: npm link --ignore-scripts + - uses: microsoft/setup-msbuild@v2 + - name: Build + run: | + .\scripts\ci\windows-build.bat + - name: Run node tests + shell: bash + run: | + ./lib/binding/osrm-datastore.exe test/data/ch/monaco.osrm + node test/nodejs/index.js + - name: Build Node package + shell: bash + run: ./scripts/ci/node_package.sh + - name: Publish Node package + if: ${{ env.PUBLISH == 'On' }} + uses: ncipollo/release-action@v1 + with: + allowUpdates: true + artifactErrorsFailBuild: true + artifacts: build/stage/**/*.tar.gz + omitBody: true + omitBodyDuringUpdate: true + omitName: true + omitNameDuringUpdate: true + replacesArtifacts: true + token: ${{ secrets.GITHUB_TOKEN }} + + format-taginfo-docs: + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + - name: Use Node.js + uses: actions/setup-node@v4 + with: + node-version: 18 + - name: Enable Node.js cache + uses: actions/cache@v4 + with: + path: ~/.npm + key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-node- + - name: Prepare environment + run: | + npm ci --ignore-scripts + clang-format-15 --version + - name: Run checks + run: | + ./scripts/check_taginfo.py taginfo.json profiles/car.lua + ./scripts/format.sh && ./scripts/error_on_dirty.sh + node ./scripts/validate_changelog.js + npm run docs && ./scripts/error_on_dirty.sh + npm audit --production + + docker-image: + needs: format-taginfo-docs + runs-on: ubuntu-22.04 + continue-on-error: false + steps: + - name: Check out the repo + uses: actions/checkout@v4 + - name: Enable osm.pbf cache + uses: actions/cache@v4 + with: + path: berlin-latest.osm.pbf + key: v1-berlin-osm-pbf + restore-keys: | + v1-berlin-osm-pbf + - name: Docker build + run: | + docker build -t osrm-backend-local -f docker/Dockerfile . + - name: Test Docker image + run: | + if [ ! -f "${PWD}/berlin-latest.osm.pbf" ]; then + wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf + fi + TAG=osrm-backend-local + # when `--memory-swap` value equals `--memory` it means container won't use swap + # see https://docs.docker.com/config/containers/resource_constraints/#--memory-swap-details + MEMORY_ARGS="--memory=1g --memory-swap=1g" + docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-extract --dump-nbg-graph -p /opt/car.lua /data/berlin-latest.osm.pbf + docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-components /data/berlin-latest.osrm.nbg /data/berlin-latest.geojson + if [ ! -s "${PWD}/berlin-latest.geojson" ] + then + >&2 echo "No berlin-latest.geojson found" + exit 1 + fi + + # removing `.osrm.nbg` to check that whole pipeline works without it + rm -rf "${PWD}/berlin-latest.osrm.nbg" + + docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-partition /data/berlin-latest.osrm + docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-customize /data/berlin-latest.osrm + docker run $MEMORY_ARGS --name=osrm-container -t -p 5000:5000 -v "${PWD}:/data" "${TAG}" osrm-routed --algorithm mld /data/berlin-latest.osrm & + curl --retry-delay 3 --retry 10 --retry-all-errors "http://127.0.0.1:5000/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true" + docker stop osrm-container build-test-publish: - # needs: format-taginfo-docs + needs: format-taginfo-docs strategy: matrix: include: - # - name: gcc-13-debug-cov - # continue-on-error: false - # node: 20 - # runs-on: ubuntu-24.04 - # BUILD_TOOLS: ON - # BUILD_TYPE: Debug - # CCOMPILER: gcc-13 - # CUCUMBER_TIMEOUT: 20000 - # CXXCOMPILER: g++-13 - # ENABLE_COVERAGE: ON - - # - name: clang-15-debug-asan-ubsan - # continue-on-error: false - # node: 20 - # runs-on: ubuntu-22.04 - # BUILD_TOOLS: ON - # BUILD_TYPE: Debug - # CCOMPILER: clang-15 - # CUCUMBER_TIMEOUT: 20000 - # CXXCOMPILER: clang++-15 - # ENABLE_SANITIZER: ON - # TARGET_ARCH: x86_64-asan-ubsan - # OSRM_CONNECTION_RETRIES: 10 - # OSRM_CONNECTION_EXP_BACKOFF_COEF: 1.5 - - # - name: clang-15-release - # continue-on-error: false - # node: 18 - # runs-on: ubuntu-22.04 - # BUILD_TOOLS: ON - # BUILD_TYPE: Release - # CCOMPILER: clang-15 - # CXXCOMPILER: clang++-15 - # CUCUMBER_TIMEOUT: 60000 - - # - name: clang-15-debug - # continue-on-error: false - # node: 18 - # runs-on: ubuntu-22.04 - # BUILD_TOOLS: ON - # BUILD_TYPE: Debug - # CCOMPILER: clang-15 - # CXXCOMPILER: clang++-15 - # CUCUMBER_TIMEOUT: 60000 - - - name: clang-18-debug-clang-tidy + - name: gcc-13-debug-cov continue-on-error: false - node: 18 + node: 20 runs-on: ubuntu-24.04 BUILD_TOOLS: ON BUILD_TYPE: Debug - CCOMPILER: clang-18 - CXXCOMPILER: clang++-18 + CCOMPILER: gcc-13 + CUCUMBER_TIMEOUT: 20000 + CXXCOMPILER: g++-13 + ENABLE_COVERAGE: ON + + - name: clang-15-debug-asan-ubsan + continue-on-error: false + node: 20 + runs-on: ubuntu-22.04 + BUILD_TOOLS: ON + BUILD_TYPE: Debug + CCOMPILER: clang-15 + CUCUMBER_TIMEOUT: 20000 + CXXCOMPILER: clang++-15 + ENABLE_SANITIZER: ON + TARGET_ARCH: x86_64-asan-ubsan + OSRM_CONNECTION_RETRIES: 10 + OSRM_CONNECTION_EXP_BACKOFF_COEF: 1.5 + + - name: clang-15-release + continue-on-error: false + node: 18 + runs-on: ubuntu-22.04 + BUILD_TOOLS: ON + BUILD_TYPE: Release + CCOMPILER: clang-15 + CXXCOMPILER: clang++-15 + CUCUMBER_TIMEOUT: 60000 + + - name: clang-15-debug + continue-on-error: false + node: 18 + runs-on: ubuntu-22.04 + BUILD_TOOLS: ON + BUILD_TYPE: Debug + CCOMPILER: clang-15 + CXXCOMPILER: clang++-15 + CUCUMBER_TIMEOUT: 60000 + + - name: clang-15-debug-clang-tidy + continue-on-error: false + node: 18 + runs-on: ubuntu-22.04 + BUILD_TOOLS: ON + BUILD_TYPE: Debug + CCOMPILER: clang-15 + CXXCOMPILER: clang++-15 CUCUMBER_TIMEOUT: 60000 ENABLE_CLANG_TIDY: ON - # - name: clang-14-release - # continue-on-error: false - # node: 18 - # runs-on: ubuntu-22.04 - # BUILD_TOOLS: ON - # BUILD_TYPE: Release - # CCOMPILER: clang-14 - # CXXCOMPILER: clang++-14 - # CUCUMBER_TIMEOUT: 60000 - - # - name: clang-13-release - # continue-on-error: false - # node: 18 - # runs-on: ubuntu-22.04 - # BUILD_TOOLS: ON - # BUILD_TYPE: Release - # CCOMPILER: clang-13 - # CXXCOMPILER: clang++-13 - # CUCUMBER_TIMEOUT: 60000 - - # - name: conan-linux-debug-asan-ubsan - # continue-on-error: false - # node: 18 - # runs-on: ubuntu-22.04 - # BUILD_TOOLS: ON - # BUILD_TYPE: Release - # CCOMPILER: clang-15 - # CXXCOMPILER: clang++-15 - # ENABLE_CONAN: ON - # ENABLE_SANITIZER: ON - - # - name: conan-linux-release - # continue-on-error: false - # node: 18 - # runs-on: ubuntu-22.04 - # BUILD_TOOLS: ON - # BUILD_TYPE: Release - # CCOMPILER: clang-15 - # CXXCOMPILER: clang++-15 - # ENABLE_CONAN: ON - - # - name: gcc-14-release - # continue-on-error: false - # node: 20 - # runs-on: ubuntu-24.04 - # BUILD_TOOLS: ON - # BUILD_TYPE: Release - # CCOMPILER: gcc-14 - # CXXCOMPILER: g++-14 - # CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized' - - # - name: gcc-13-release - # continue-on-error: false - # node: 20 - # runs-on: ubuntu-24.04 - # BUILD_TOOLS: ON - # BUILD_TYPE: Release - # CCOMPILER: gcc-13 - # CXXCOMPILER: g++-13 - # CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized' - - # - name: gcc-12-release - # continue-on-error: false - # node: 20 - # runs-on: ubuntu-22.04 - # BUILD_TOOLS: ON - # BUILD_TYPE: Release - # CCOMPILER: gcc-12 - # CXXCOMPILER: g++-12 - # CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized' - - # - name: conan-linux-release-node - # build_node_package: true - # continue-on-error: false - # node: 20 - # runs-on: ubuntu-22.04 - # BUILD_TYPE: Release - # CCOMPILER: clang-13 - # CXXCOMPILER: clang++-13 - # ENABLE_CONAN: ON - # NODE_PACKAGE_TESTS_ONLY: ON - - # - name: conan-linux-debug-node - # build_node_package: true - # continue-on-error: false - # node: 20 - # runs-on: ubuntu-22.04 - # BUILD_TYPE: Debug - # CCOMPILER: clang-13 - # CXXCOMPILER: clang++-13 - # ENABLE_CONAN: ON - # NODE_PACKAGE_TESTS_ONLY: ON - - # - name: conan-macos-x64-release-node - # build_node_package: true - # continue-on-error: true - # node: 20 - # runs-on: macos-13 # x86_64 - # BUILD_TYPE: Release - # CCOMPILER: clang - # CXXCOMPILER: clang++ - # CUCUMBER_TIMEOUT: 60000 - # ENABLE_ASSERTIONS: ON - # ENABLE_CONAN: ON - - # - name: conan-macos-arm64-release-node - # build_node_package: true - # continue-on-error: true - # node: 20 - # runs-on: macos-14 # arm64 - # BUILD_TYPE: Release - # CCOMPILER: clang - # CXXCOMPILER: clang++ - # CUCUMBER_TIMEOUT: 60000 - # ENABLE_ASSERTIONS: ON - # ENABLE_CONAN: ON + - name: clang-14-release + continue-on-error: false + node: 18 + runs-on: ubuntu-22.04 + BUILD_TOOLS: ON + BUILD_TYPE: Release + CCOMPILER: clang-14 + CXXCOMPILER: clang++-14 + CUCUMBER_TIMEOUT: 60000 + + - name: clang-13-release + continue-on-error: false + node: 18 + runs-on: ubuntu-22.04 + BUILD_TOOLS: ON + BUILD_TYPE: Release + CCOMPILER: clang-13 + CXXCOMPILER: clang++-13 + CUCUMBER_TIMEOUT: 60000 + + - name: conan-linux-debug-asan-ubsan + continue-on-error: false + node: 18 + runs-on: ubuntu-22.04 + BUILD_TOOLS: ON + BUILD_TYPE: Release + CCOMPILER: clang-15 + CXXCOMPILER: clang++-15 + ENABLE_CONAN: ON + ENABLE_SANITIZER: ON + + - name: conan-linux-release + continue-on-error: false + node: 18 + runs-on: ubuntu-22.04 + BUILD_TOOLS: ON + BUILD_TYPE: Release + CCOMPILER: clang-15 + CXXCOMPILER: clang++-15 + ENABLE_CONAN: ON + + - name: gcc-14-release + continue-on-error: false + node: 20 + runs-on: ubuntu-24.04 + BUILD_TOOLS: ON + BUILD_TYPE: Release + CCOMPILER: gcc-14 + CXXCOMPILER: g++-14 + CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized' + + - name: gcc-13-release + continue-on-error: false + node: 20 + runs-on: ubuntu-24.04 + BUILD_TOOLS: ON + BUILD_TYPE: Release + CCOMPILER: gcc-13 + CXXCOMPILER: g++-13 + CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized' + + - name: gcc-12-release + continue-on-error: false + node: 20 + runs-on: ubuntu-22.04 + BUILD_TOOLS: ON + BUILD_TYPE: Release + CCOMPILER: gcc-12 + CXXCOMPILER: g++-12 + CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized' + + - name: conan-linux-release-node + build_node_package: true + continue-on-error: false + node: 20 + runs-on: ubuntu-22.04 + BUILD_TYPE: Release + CCOMPILER: clang-13 + CXXCOMPILER: clang++-13 + ENABLE_CONAN: ON + NODE_PACKAGE_TESTS_ONLY: ON + + - name: conan-linux-debug-node + build_node_package: true + continue-on-error: false + node: 20 + runs-on: ubuntu-22.04 + BUILD_TYPE: Debug + CCOMPILER: clang-13 + CXXCOMPILER: clang++-13 + ENABLE_CONAN: ON + NODE_PACKAGE_TESTS_ONLY: ON + + - name: conan-macos-x64-release-node + build_node_package: true + continue-on-error: true + node: 20 + runs-on: macos-13 # x86_64 + BUILD_TYPE: Release + CCOMPILER: clang + CXXCOMPILER: clang++ + CUCUMBER_TIMEOUT: 60000 + ENABLE_ASSERTIONS: ON + ENABLE_CONAN: ON + + - name: conan-macos-arm64-release-node + build_node_package: true + continue-on-error: true + node: 20 + runs-on: macos-14 # arm64 + BUILD_TYPE: Release + CCOMPILER: clang + CXXCOMPILER: clang++ + CUCUMBER_TIMEOUT: 60000 + ENABLE_ASSERTIONS: ON + ENABLE_CONAN: ON name: ${{ matrix.name}} continue-on-error: ${{ matrix.continue-on-error }} @@ -615,97 +615,98 @@ jobs: ccache -p ccache -s - # benchmarks: - # if: github.event_name == 'pull_request' - # needs: [format-taginfo-docs] - # runs-on: ubuntu-22.04 - # env: - # CCOMPILER: clang-13 - # CXXCOMPILER: clang++-13 - # CC: clang-13 - # CXX: clang++-13 - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # PR_NUMBER: ${{ github.event.pull_request.number }} - # GITHUB_REPOSITORY: ${{ github.repository }} - # steps: - # - name: Enable data.osm.pbf cache - # uses: actions/cache@v4 - # with: - # path: ~/data.osm.pbf - # key: v1-data-osm-pbf - # restore-keys: | - # v1-data-osm-pbf - # - name: Enable compiler cache - # uses: actions/cache@v4 - # with: - # path: ~/.ccache - # key: v1-ccache-benchmarks-${{ github.sha }} - # restore-keys: | - # v1-ccache-benchmarks- - # - name: Enable Conan cache - # uses: actions/cache@v4 - # with: - # path: ~/.conan - # key: v1-conan-benchmarks-${{ github.sha }} - # restore-keys: | - # v1-conan-benchmarks- - # - name: Checkout PR Branch - # uses: actions/checkout@v4 - # with: - # ref: ${{ github.head_ref }} - # path: pr - # - name: Install dependencies - # run: | - # python3 -m pip install "conan<2.0.0" "requests==2.31.0" "locust==2.28.0" - # sudo apt-get update -y && sudo apt-get install ccache - # - name: Prepare data - # run: | - # if [ ! -f "~/data.osm.pbf" ]; then - # wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf -O ~/data.osm.pbf - # fi - # gunzip -c ./pr/test/data/berlin_gps_traces.csv.gz > ~/gps_traces.csv - # - name: Prepare environment - # run: | - # echo "CCACHE_DIR=$HOME/.ccache" >> $GITHUB_ENV - # mkdir -p $HOME/.ccache - # ccache --zero-stats - # ccache --max-size=256M - # - name: Build PR Branch - # run: | - # mkdir -p pr/build - # cd pr/build - # cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release .. - # make -j$(nproc) - # make -j$(nproc) benchmarks - # cd .. - # make -C test/data - # - name: Checkout Base Branch - # uses: actions/checkout@v4 - # with: - # ref: ${{ github.event.pull_request.base.ref }} - # path: base - # - name: Build Base Branch - # run: | - # mkdir base/build - # cd base/build - # cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release .. - # make -j$(nproc) - # make -j$(nproc) benchmarks - # cd .. - # make -C test/data - # - name: Run Benchmarks - # run: | - # ./pr/scripts/ci/run_benchmarks.sh base pr - # - name: Post Benchmark Results - # run: | - # python3 pr/scripts/ci/post_benchmark_results.py base_results pr_results - # - name: Show CCache statistics - # run: | - # ccache -p - # ccache -s - - # ci-complete: - # runs-on: ubuntu-22.04 - # needs: [build-test-publish, docker-image, windows-release-node, benchmarks] - # steps: - # - run: echo "CI complete" + benchmarks: + if: github.event_name == 'pull_request' + needs: [format-taginfo-docs] + runs-on: ubuntu-22.04 + env: + CCOMPILER: clang-13 + CXXCOMPILER: clang++-13 + CC: clang-13 + CXX: clang++-13 + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PR_NUMBER: ${{ github.event.pull_request.number }} + GITHUB_REPOSITORY: ${{ github.repository }} + steps: + - name: Enable data.osm.pbf cache + uses: actions/cache@v4 + with: + path: ~/data.osm.pbf + key: v1-data-osm-pbf + restore-keys: | + v1-data-osm-pbf + - name: Enable compiler cache + uses: actions/cache@v4 + with: + path: ~/.ccache + key: v1-ccache-benchmarks-${{ github.sha }} + restore-keys: | + v1-ccache-benchmarks- + - name: Enable Conan cache + uses: actions/cache@v4 + with: + path: ~/.conan + key: v1-conan-benchmarks-${{ github.sha }} + restore-keys: | + v1-conan-benchmarks- + - name: Checkout PR Branch + uses: actions/checkout@v4 + with: + ref: ${{ github.head_ref }} + path: pr + - name: Install dependencies + run: | + python3 -m pip install "conan<2.0.0" "requests==2.31.0" "locust==2.28.0" + sudo apt-get update -y && sudo apt-get install ccache + - name: Prepare data + run: | + if [ ! -f "~/data.osm.pbf" ]; then + wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf -O ~/data.osm.pbf + fi + # wget http://download.geofabrik.de/europe/germany-latest.osm.pbf -O ~/data.osm.pbf --quiet + gunzip -c ./pr/test/data/berlin_gps_traces.csv.gz > ~/gps_traces.csv + - name: Prepare environment + run: | + echo "CCACHE_DIR=$HOME/.ccache" >> $GITHUB_ENV + mkdir -p $HOME/.ccache + ccache --zero-stats + ccache --max-size=256M + - name: Build PR Branch + run: | + mkdir -p pr/build + cd pr/build + cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release .. + make -j$(nproc) + make -j$(nproc) benchmarks + cd .. + make -C test/data + - name: Checkout Base Branch + uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.base.ref }} + path: base + - name: Build Base Branch + run: | + mkdir base/build + cd base/build + cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release .. + make -j$(nproc) + make -j$(nproc) benchmarks + cd .. + make -C test/data + - name: Run Benchmarks + run: | + ./pr/scripts/ci/run_benchmarks.sh base pr + - name: Post Benchmark Results + run: | + python3 pr/scripts/ci/post_benchmark_results.py base_results pr_results + - name: Show CCache statistics + run: | + ccache -p + ccache -s + + ci-complete: + runs-on: ubuntu-22.04 + needs: [build-test-publish, docker-image, windows-release-node, benchmarks] + steps: + - run: echo "CI complete" From 8cb6ff5a16cf86f15e151b21241be4066f93b93a Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Fri, 7 Jun 2024 22:19:40 +0200 Subject: [PATCH 09/10] wip --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63323a56c24..7b8e85b756a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - NodeJS: - CHANGED: Use node-api instead of NAN. [#6452](https://github.com/Project-OSRM/osrm-backend/pull/6452) - Misc: + - FIXED: Fix performance-noexcept-move-constructor clang-tidy warning. [#6931](https://github.com/Project-OSRM/osrm-backend/pull/6933) - FIXED: Fix performance-noexcept-swap clang-tidy warning. [#6931](https://github.com/Project-OSRM/osrm-backend/pull/6931) - CHANGED: Use custom struct instead of std::pair in QueryHeap. [#6921](https://github.com/Project-OSRM/osrm-backend/pull/6921) - CHANGED: Use std::string_view::starts_with instead of boost::starts_with. [#6918](https://github.com/Project-OSRM/osrm-backend/pull/6918) From e28d74f0935c8d659f39e5de0957ec5610f00ddb Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Fri, 7 Jun 2024 22:22:57 +0200 Subject: [PATCH 10/10] wip --- .github/workflows/osrm-backend.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 96828d790ff..e787b31c6eb 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -192,14 +192,14 @@ jobs: CXXCOMPILER: clang++-15 CUCUMBER_TIMEOUT: 60000 - - name: clang-15-debug-clang-tidy + - name: clang-18-debug-clang-tidy continue-on-error: false node: 18 - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 BUILD_TOOLS: ON BUILD_TYPE: Debug - CCOMPILER: clang-15 - CXXCOMPILER: clang++-15 + CCOMPILER: clang-18 + CXXCOMPILER: clang++-18 CUCUMBER_TIMEOUT: 60000 ENABLE_CLANG_TIDY: ON @@ -663,7 +663,6 @@ jobs: if [ ! -f "~/data.osm.pbf" ]; then wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf -O ~/data.osm.pbf fi - # wget http://download.geofabrik.de/europe/germany-latest.osm.pbf -O ~/data.osm.pbf --quiet gunzip -c ./pr/test/data/berlin_gps_traces.csv.gz > ~/gps_traces.csv - name: Prepare environment run: |