[CI] Do native tests with and without rv

Adresses: #26

[CI] Do native tests with and without rv
d6811df6 · Jö Fahlke · aa985b8f · d6811df6
Commit d6811df6 authored 6 years ago by Jö Fahlke
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ stages:
 - pacxx-source
 - pacxx-build
 - mkimage
+- samples-build
 - test
 - deploy

@@ -262,94 +263,159 @@ stop-mkimage:

 ######################################################################
 #
-#  Test: test the just built images
+#  samples Build: build samples using the pacxx images
 #

-test-native-make-debug:
-  stage: test
+.samples-build: &samples-build
+  stage: samples-build
  dependencies:
  - samples-source
-  image: $REGISTRY/$CI_PROJECT_PATH:pacxx-native.$PIPELINE_TAG
+  variables:
+    GIT_STRATEGY: none
+  before_script:
+  - cat /opt/pacxx/repoversions
+  - cat samples/repoversions
+  - mkdir bsamples
+  - cd bsamples
  tags:
  - hpc2seci
+  artifacts:
+    paths:
+    - bsamples/
+    expire_in: 1 week
+
+samples-build-native-make-debug:
+  <<: *samples-build
+  image: $REGISTRY/$CI_PROJECT_PATH:pacxx-native.$PIPELINE_TAG
+  script:
+  - cmake ../samples -DCMAKE_CXX_COMPILER=pacxx++ -DCMAKE_BUILD_TYPE=Debug
+  - make -j$(nproc)
+
+samples-build-native-ninja-release:
+  <<: *samples-build
+  image: $REGISTRY/$CI_PROJECT_PATH:pacxx-native.$PIPELINE_TAG
+  script:
+  - cmake ../samples -G Ninja -DCMAKE_CXX_COMPILER=pacxx++ -DCMAKE_BUILD_TYPE=Release
+  - ninja
+
+samples-build-cuda-make-debug:
+  <<: *samples-build
+  image: $REGISTRY/$CI_PROJECT_PATH:pacxx-cuda.$PIPELINE_TAG
+  script:
+  - cmake ../samples -DCMAKE_CXX_COMPILER=pacxx++ -DCMAKE_BUILD_TYPE=Debug
+  - make -k -j$(nproc)
+
+samples-build-cuda-make-release:
+  <<: *samples-build
+  image: $REGISTRY/$CI_PROJECT_PATH:pacxx-cuda.$PIPELINE_TAG
+  script:
+  - cmake ../samples -DCMAKE_CXX_COMPILER=pacxx++ -DCMAKE_BUILD_TYPE=Release
+  - make -k -j$(nproc)
+
+######################################################################
+#
+#  Test: test the just built images
+#
+
+.test: &test
+  stage: test
  variables:
    GIT_STRATEGY: none
    PACXX_FORCE_DEFAULT_RT: 1
-    PACXX_DEFAULT_RT: 1 # native
-  script:
+  before_script:
  - cat /opt/pacxx/repoversions
  - cat samples/repoversions
-  - mkdir build
-  - cd build
-  - cmake ../samples -DCMAKE_CXX_COMPILER=pacxx++ -DCMAKE_BUILD_TYPE=Debug
-  - make -j$(nproc)
-  - ctest -j$(nproc) -LE '^native-debug-(known-failure|slow)$' --output-on-failure
-  - ctest -j$(nproc) -L '^native-debug-known-failure$' --output-on-failure || true
+  - cd bsamples
+
+test-native-norv-debug:
+  <<: *test
+  image: $REGISTRY/$CI_PROJECT_PATH:pacxx-native.$PIPELINE_TAG
+  dependencies:
+  - samples-source
+  - samples-build-native-make-debug
+  tags:
+  - hpc2seci
+  variables:
+    PACXX_DEFAULT_RT: 1 # native
+    PACXX_DISABLE_RV: 1 # disable region vectorizer
+  script:
+  - ctest -j$(nproc) -LE '^(native|norv)-debug-(known-failure|slow)$' --output-on-failure
+  - ctest -j$(nproc) -L '^(native|norv)-debug-known-failure$' --output-on-failure || true
  - ": The following tests were skipped because they are known to be slow"
-  - ctest -N -L '^native-debug-slow$'
+  - ctest -N -L '^(native|norv)-debug-slow$'

-test-native-ninja-release:
-  stage: test
+test-native-norv-release:
+  <<: *test
+  image: $REGISTRY/$CI_PROJECT_PATH:pacxx-native.$PIPELINE_TAG
  dependencies:
  - samples-source
+  - samples-build-native-ninja-release
+  tags:
+  - hpc2seci
+  variables:
+    PACXX_DEFAULT_RT: 1 # native
+    PACXX_DISABLE_RV: 1 # disable region vectorizer
+  script:
+  - ctest -j$(nproc) -LE '^(native|norv)-release-known-failure$' --output-on-failure
+  - ctest -j$(nproc) -L '^(native|norv)-release-known-failure$' --output-on-failure || true
+
+test-native-rv-debug:
+  <<: *test
  image: $REGISTRY/$CI_PROJECT_PATH:pacxx-native.$PIPELINE_TAG
+  dependencies:
+  - samples-source
+  - samples-build-native-make-debug
  tags:
  - hpc2seci
  variables:
-    GIT_STRATEGY: none
-    PACXX_FORCE_DEFAULT_RT: 1
    PACXX_DEFAULT_RT: 1 # native
  script:
-  - cat /opt/pacxx/repoversions
-  - cat samples/repoversions
-  - mkdir build
-  - cd build
-  - cmake ../samples -G Ninja -DCMAKE_CXX_COMPILER=pacxx++ -DCMAKE_BUILD_TYPE=Release
-  - ninja
-  - ctest -j$(nproc) -LE '^native-release-known-failure$' --output-on-failure
-  - ctest -j$(nproc) -L '^native-release-known-failure$' --output-on-failure || true
+  - ctest -j$(nproc) -LE '^(native|rv)-debug-(known-failure|slow)$' --output-on-failure
+  - ctest -j$(nproc) -L '^(native|rv)-debug-known-failure$' --output-on-failure || true
+  - ": The following tests were skipped because they are known to be slow"
+  - ctest -N -L '^(native|rv)-debug-slow$'

-test-cuda-make-debug:
-  stage: test
+test-native-rv-release:
+  <<: *test
+  image: $REGISTRY/$CI_PROJECT_PATH:pacxx-native.$PIPELINE_TAG
  dependencies:
  - samples-source
+  - samples-build-native-ninja-release
+  tags:
+  - hpc2seci
+  variables:
+    PACXX_DEFAULT_RT: 1 # native
+  script:
+  - ctest -j$(nproc) -LE '^(native|rv)-release-known-failure$' --output-on-failure
+  - ctest -j$(nproc) -L '^(native|rv)-release-known-failure$' --output-on-failure || true
+
+test-cuda-debug:
+  <<: *test
  image: $REGISTRY/$CI_PROJECT_PATH:pacxx-cuda.$PIPELINE_TAG
+  dependencies:
+  - samples-source
+  - samples-build-cuda-make-debug
  tags:
  - hpc2seci-nvidia
  variables:
-    GIT_STRATEGY: none
-    PACXX_FORCE_DEFAULT_RT: 1
    PACXX_DEFAULT_RT: 0 # Cuda
  script:
-  - cat /opt/pacxx/repoversions
-  - cat samples/repoversions
-  - mkdir build
-  - cd build
-  - cmake ../samples -DCMAKE_CXX_COMPILER=pacxx++ -DCMAKE_BUILD_TYPE=Debug
-  - make -k -j$(nproc)
  - ctest -j$(nproc) -LE '^cuda-debug-(known-failure|slow)$' --output-on-failure
  - ctest -j$(nproc) -L '^cuda-debug-known-failure$' --output-on-failure || true
  - ": The following tests were skipped because they are known to be slow"
  - ctest -N -L '^cuda-debug-slow$'

-test-cuda-make-release:
-  stage: test
+test-cuda-release:
+  <<: *test
+  image: $REGISTRY/$CI_PROJECT_PATH:pacxx-cuda.$PIPELINE_TAG
  dependencies:
  - samples-source
-  image: $REGISTRY/$CI_PROJECT_PATH:pacxx-cuda.$PIPELINE_TAG
+  - samples-build-cuda-make-release
  tags:
  - hpc2seci-nvidia
  variables:
-    GIT_STRATEGY: none
-    PACXX_FORCE_DEFAULT_RT: 1
    PACXX_DEFAULT_RT: 0 # Cuda
  script:
-  - cat /opt/pacxx/repoversions
-  - cat samples/repoversions
-  - mkdir build
-  - cd build
-  - cmake ../samples -DCMAKE_CXX_COMPILER=pacxx++ -DCMAKE_BUILD_TYPE=Release
-  - make -k -j$(nproc)
  - ctest -j$(nproc) -LE '^cuda-release-known-failure$' --output-on-failure
  - ctest -j$(nproc) -L '^cuda-release-known-failure$' --output-on-failure || true