Merge remote-tracking branch 'GFDL/main' into feature/update-to-GFDL-…

…20211019

.github/actions/testing-setup/action.yml

@@ -33,6 +33,7 @@ runs:
         echo "::group::Install linux packages"
         sudo apt-get update
         sudo apt-get install netcdf-bin libnetcdf-dev libnetcdff-dev mpich libmpich-dev
+        sudo apt-get install linux-tools-common
         echo "::endgroup::"
 
     - name: Compile FMS library

.github/workflows/expression.yml

@@ -24,4 +24,4 @@ jobs:
       run: make run.symmetric -k -s
 
     - name: Run tests
-      run: make test.repros test.dims -k -s
+      run: make test.repro test.dim -k -s

.github/workflows/other.yml

@@ -24,4 +24,4 @@ jobs:
       run: make run.symmetric -k -s
 
     - name: Run tests
-      run: make test.openmps test.nans test.restarts -k -s
+      run: make test.openmp test.nan test.restart -k -s

.github/workflows/perfmon.yml

@@ -0,0 +1,36 @@
+name: Performance Monitor
+
+on: [pull_request]
+
+jobs:
+  build-test-perfmon:
+
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: .testing
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: recursive
+
+    - uses: ./.github/actions/testing-setup
+
+    - name: Compile optimized models
+      run: >-
+        make -j build.prof
+        MOM_TARGET_SLUG=$GITHUB_REPOSITORY
+        MOM_TARGET_LOCAL_BRANCH=$GITHUB_BASE_REF
+        DO_REGRESSION_TESTS=true
+
+    - name: Generate profile data
+      run: >-
+        pip install f90nml &&
+        make profile
+        DO_REGRESSION_TESTS=true
+
+    - name: Generate perf data
+      run: |
+        sudo sysctl -w kernel.perf_event_paranoid=2
+        make perf DO_REGRESSION_TESTS=true

.github/workflows/regression.yml

@@ -24,4 +24,4 @@ jobs:
       run: make run.symmetric -k -s
 
     - name: Regression test
-      run: make test.regressions DO_REGRESSION_TESTS=true -k -s
+      run: make test.regression DO_REGRESSION_TESTS=true -k -s

.github/workflows/stencil.yml

@@ -24,4 +24,4 @@ jobs:
       run: make run.symmetric -k -s
 
     - name: Run tests
-      run: make test.grids test.layouts test.rotations -k -s
+      run: make test.grid test.layout test.rotate -k -s