[DEBUG] Test CI run with all jobs using 8 cores (xlarge or large resource class)

2023-10-03 13:03:40 +00:00 · 2021-10-28 13:28:07 +02:00 · 2021-10-28 13:28:07 +02:00 · 3cadb1ae89
commit 3cadb1ae89
parent 4b76a7203a
2 changed files with 41 additions and 10 deletions
--- a/.circleci/build_win.ps1
+++ b/.circleci/build_win.ps1
@ -20,7 +20,7 @@ cd build
 $boost_dir=(Resolve-Path $PSScriptRoot\..\deps\boost\lib\cmake\Boost-*)
 ..\deps\cmake\bin\cmake -G "Visual Studio 16 2019" -DBoost_DIR="$boost_dir\" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_INSTALL_PREFIX="$PSScriptRoot\..\upload" -DUSE_Z3=OFF ..
 if ( -not $? ) { throw "CMake configure failed." }
-msbuild solidity.sln /p:Configuration=Release /m:5 /v:minimal
+msbuild solidity.sln /p:Configuration=Release /m:10 /v:minimal
 if ( -not $? ) { throw "Build failed." }
-..\deps\cmake\bin\cmake --build . -j 5 --target install --config Release
+..\deps\cmake\bin\cmake --build . -j 10 --target install --config Release
 if ( -not $? ) { throw "Install target failed." }
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -203,21 +203,23 @@ defaults:
  - base_ubuntu1604_clang: &base_ubuntu1604_clang
      docker:
        - image: << pipeline.parameters.ubuntu-1604-clang-ossfuzz-docker-image >>
+      resource_class: xlarge
      environment:
        TERM: xterm
+        MAKEFLAGS: -j 10

  - base_ubuntu2004_clang: &base_ubuntu2004_clang
      docker:
        - image: << pipeline.parameters.ubuntu-2004-clang-docker-image >>
+      resource_class: xlarge
      environment:
        TERM: xterm
        CC: clang
        CXX: clang++
-        MAKEFLAGS: -j 3
+        MAKEFLAGS: -j 10

  - base_ubuntu2004_clang_xlarge: &base_ubuntu2004_clang_xlarge
      <<: *base_ubuntu2004_clang
-      resource_class: xlarge
      environment:
        TERM: xterm
        CC: clang
@ -227,12 +229,13 @@ defaults:
  - base_ubuntu2004: &base_ubuntu2004
      docker:
        - image: << pipeline.parameters.ubuntu-2004-docker-image >>
+      resource_class: xlarge
      environment:
        TERM: xterm
+        MAKEFLAGS: -j 10

  - base_ubuntu2004_xlarge: &base_ubuntu2004_xlarge
      <<: *base_ubuntu2004
-      resource_class: xlarge
      environment:
        TERM: xterm
        MAKEFLAGS: -j 10
@ -240,36 +243,46 @@ defaults:
  - base_buildpack_focal: &base_buildpack_focal
      docker:
        - image: buildpack-deps:focal
+      resource_class: xlarge
      environment:
        TERM: xterm
+        MAKEFLAGS: -j 10

  - base_buildpack_latest: &base_buildpack_latest
      docker:
        - image: buildpack-deps:latest
+      resource_class: xlarge
      environment:
        TERM: xterm
+        MAKEFLAGS: -j 10

  - base_archlinux: &base_archlinux
      docker:
        - image: archlinux:base
+      resource_class: xlarge
      environment:
        TERM: xterm
+        MAKEFLAGS: -j 10

  - base_win_powershell: &base_win_powershell
      executor:
        name: win/default
        shell: powershell.exe
+        size: large

  - base_win_cmd: &base_win_cmd
      executor:
        name: win/default
        shell: cmd.exe
+        size: large

  - base_osx: &base_osx
      macos:
        xcode: "11.0.0"
+      resource_class: large
      environment:
        TERM: xterm
+        MAKEFLAGS: -j 10

  - base_ems_xlarge: &base_ems_xlarge
      docker:
@ -282,14 +295,18 @@ defaults:
  - base_python: &base_python
      docker:
        - image: circleci/python:3.6
+      resource_class: xlarge
      environment:
        TERM: xterm
+        MAKEFLAGS: -j 10

  - base_node_latest: &base_node_latest
      docker:
        - image: circleci/node
+      resource_class: xlarge
      environment:
        TERM: xterm
+        MAKEFLAGS: -j 10

  # --------------------------------------------------------------------------
  # Workflow Templates
@ -536,7 +553,7 @@ jobs:
      CC: clang
      CXX: clang++
      CMAKE_OPTIONS: -DSANITIZE=address
-      MAKEFLAGS: -j 3
+      MAKEFLAGS: -j 10
    steps:
      - checkout
      - run: *run_build
@ -549,7 +566,7 @@ jobs:
      CC: clang
      CXX: clang++
      CMAKE_OPTIONS: -DSANITIZE=undefined
-      MAKEFLAGS: -j 3
+      MAKEFLAGS: -j 10
    steps:
      - checkout
      - run: *run_build
@ -589,10 +606,11 @@ jobs:

  t_ubu_codecov:
    <<: *base_ubuntu2004
-    parallelism: 6
+    parallelism: 10
    environment:
      EVM: << pipeline.parameters.evm-version >>
      OPTIMIZE: 1
+      MAKEFLAGS: -j 10
    steps:
      - checkout
      - attach_workspace:
@ -650,7 +668,7 @@ jobs:
    <<: *base_archlinux
    environment:
      TERM: xterm
-      MAKEFLAGS: -j 3
+      MAKEFLAGS: -j 10
    steps:
      - run:
          name: Install build dependencies
@ -666,7 +684,7 @@ jobs:
    environment:
      TERM: xterm
      CMAKE_BUILD_TYPE: Release
-      MAKEFLAGS: -j 5
+      MAKEFLAGS: -j 10
    steps:
      - checkout
      - restore_cache:
@ -703,6 +721,7 @@ jobs:
      EVM: << pipeline.parameters.evm-version >>
      OPTIMIZE: 0
      TERM: xterm
+      MAKEFLAGS: -j 10
    steps:
      - checkout
      - restore_cache:
@ -772,6 +791,7 @@ jobs:
      # For Archlinux we do not have prebuilt docker images and we would need to build evmone from source,
      # thus we forgo semantics tests to speed things up.
      SOLTEST_FLAGS: --no-semantic-tests
+      MAKEFLAGS: -j 10
    steps:
      - run:
          name: Install runtime dependencies
@ -788,6 +808,7 @@ jobs:
      SOLTEST_FLAGS: --enforce-via-yul
      OPTIMIZE: 0
      TERM: xterm
+      MAKEFLAGS: -j 10
    <<: *steps_soltest

  t_ubu_clang_soltest: &t_ubu_clang_soltest
@ -795,6 +816,7 @@ jobs:
    environment:
      EVM: << pipeline.parameters.evm-version >>
      OPTIMIZE: 0
+      MAKEFLAGS: -j 10
    <<: *steps_soltest

  t_ubu_release_soltest_all: &t_ubu_release_soltest_all
@ -814,6 +836,7 @@ jobs:
    environment:
      TERM: xterm
      ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
+      MAKEFLAGS: -j 10
    <<: *steps_cmdline_tests

  t_ubu_asan_soltest:
@ -824,6 +847,7 @@ jobs:
      OPTIMIZE: 0
      SOLTEST_FLAGS: --no-smt
      ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
+      MAKEFLAGS: -j 10
    <<: *steps_soltest

  t_ubu_asan_clang_soltest:
@ -833,12 +857,14 @@ jobs:
      OPTIMIZE: 0
      SOLTEST_FLAGS: --no-smt
      ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
+      MAKEFLAGS: -j 10
    <<: *steps_soltest

  t_ubu_ubsan_clang_soltest:
    <<: *base_ubuntu2004_clang
    environment:
      EVM: << pipeline.parameters.evm-version >>
+      MAKEFLAGS: -j 10
    steps:
      - when:
          condition: true
@ -877,6 +903,7 @@ jobs:
    environment:
      TERM: xterm
      HARDHAT_TESTS_SOLC_PATH: /tmp/workspace/soljson.js
+      MAKEFLAGS: -j 10
    steps:
      - checkout
      - attach_workspace:
@ -912,11 +939,13 @@ jobs:
        default: no
    docker:
      - image: circleci/node:<<parameters.nodejs_version>>
+    resource_class: xlarge
    # NOTE: Each external test does 3 separate compile&test runs
    parallelism: 3
    environment:
      TERM: xterm
      COMPILE_ONLY: <<parameters.compile_only>>
+      MAKEFLAGS: -j 10
    steps:
      - checkout
      - attach_workspace:
@ -1058,6 +1087,7 @@ jobs:
    <<: *base_node_latest
    environment:
      SOLC_EMSCRIPTEN: "On"
+      MAKEFLAGS: -j 10
    steps:
      - checkout
      - attach_workspace:
@ -1081,6 +1111,7 @@ jobs:
        bytecode-report-osx-cli.txt
        bytecode-report-windows-json.txt
        bytecode-report-windows-cli.txt
+      MAKEFLAGS: -j 10
    steps:
      - attach_workspace:
          at: .