ci: Update musl build

pulp-platform · Aug 16, 2023 · f19d04c · f19d04c
1 parent 58d2626
commit f19d04c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 40 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,17 +34,9 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
-      - name: Build MUSL dependency
+      - name: Build custom math.h library dependency
         run: |
-          cd sw/deps
-          mkdir install
-          cd musl
-          CC=$LLVM_BINROOT/clang ./configure --disable-shared \
-          --prefix=../install/ --enable-wrapper=all \
-          CFLAGS="-mcpu=snitch -menable-experimental-extensions"
-          make -j4
-          make install
-          cd ../../../
+          make -C sw/math all
       - name: Build Software
         run: |
           make -C target/snitch_cluster sw
@@ -70,17 +62,9 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
-      - name: Build MUSL dependency
+      - name: Build custom math.h library dependency
         run: |
-          cd sw/deps
-          mkdir install
-          cd musl
-          CC=$LLVM_BINROOT/clang ./configure --disable-shared \
-          --prefix=../install/ --enable-wrapper=all \
-          CFLAGS="-mcpu=snitch -menable-experimental-extensions"
-          make -j4
-          make install
-          cd ../../../
+          make -C sw/math all
       - name: Build Software
         run: |
           make -C target/snitch_cluster SELECT_RUNTIME=banshee sw

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -35,40 +35,25 @@ docs:
 # Build Snitch cluster software #
 #################################
 
-snitch-cluster-sw-musl:
-  script:
-    - cd sw/deps
-    - mkdir install
-    - cd musl
-    - CC=$CLANG ./configure --disable-shared --prefix=../install/
-      --enable-wrapper=all
-      CFLAGS="-mcpu=snitch -menable-experimental-extensions"
-    - make -j4
-    - make install
-  artifacts:
-    paths:
-      - sw/deps/install/bin/*
-      - sw/deps/install/include/*
-      - sw/deps/install/lib/*
-    expire_in: 1 day
-
 snitch-cluster-sw:
-  needs: [snitch-cluster-sw-musl]
   script:
+    - make -C sw/math all
     - cd target/snitch_cluster
     - make sw
   artifacts:
     paths:
+      - sw/math/include/bits/alltypes.h
       - target/snitch_cluster/sw/**/build/*.elf
     expire_in: 1 day
 
 snitch-cluster-sw-banshee:
-  needs: [snitch-cluster-sw-musl]
   script:
+    - make -C sw/math all
     - cd target/snitch_cluster
     - make SELECT_RUNTIME=banshee sw
   artifacts:
     paths:
+      - sw/math/include/bits/alltypes.h
       - target/snitch_cluster/sw/**/build/*.elf
     expire_in: 1 day
 

diff --git a/python-requirements.txt b/python-requirements.txt
@@ -20,4 +20,4 @@ termcolor
 pandas
 
 -r docs/requirements.txt
--r sw/snDNN/requirements.txt
+-r sw/dnn/requirements.txt