From aba9e6109b95c42ed885a41d8d8d43e2cbffe34b Mon Sep 17 00:00:00 2001
From: Michael Kuron <mkuron@icp.uni-stuttgart.de>
Date: Thu, 16 Jun 2022 12:57:45 +0200
Subject: [PATCH] Update riscv64 CI for latest compiler

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab865c557..bf4b2d259 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -188,8 +188,8 @@ arm64v9:
     - sed -i s/g\+\+/clang++/g ~/.config/pystencils/config.json
 
 riscv64:
-  # The RISC-V vector extension is still experimental and needs special compiler flags.
-  # Once they are officially released, this job should be cleaned up to match the others.
+  # The RISC-V vector extension are so new they are not supported by GCC yet.
+  # Also, the image is built without the libomp package which is not yet available on Ubuntu.
   extends: .multiarch_template
   image: i10git.cs.fau.de:5005/pycodegen/pycodegen/riscv64:testing
   variables:
@@ -197,7 +197,7 @@ riscv64:
     QEMU_CPU: "rv64,v=true"
   before_script:
     - *multiarch_before_script
-    - sed -i 's/march=native/march=rv64imfdv0p10 -menable-experimental-extensions/g' ~/.config/pystencils/config.json
+    - sed -i 's/march=native/march=rv64imfdv/g' ~/.config/pystencils/config.json
     - sed -i s/g\+\+/clang++/g ~/.config/pystencils/config.json
     - sed -i 's/fopenmp/fopenmp=libgomp -I\/usr\/include\/riscv64-linux-gnu/g' ~/.config/pystencils/config.json
 
-- 
GitLab