Skip to content

Commit 0244625

Browse files
committed
gh-actions arm: adjust to how the CPU information is reported
Reduce the clang-14 targeted architecture (where we can't use `-march=native`) Seems there was also a processor downgrade, or now a mix of capabilities
1 parent 9462b0a commit 0244625

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ jobs:
270270
- id: cpu
271271
name: CPU Information
272272
run: |
273+
cat /proc/cpuinfo
273274
echo "model_name=$(grep -m1 'model name' < /proc/cpuinfo | awk '-F: ' '{ print $2}' | tr '-' '_')" >> "$GITHUB_OUTPUT"
274275
- run: sudo apt-get update
275276
- name: ccache
@@ -340,7 +341,8 @@ jobs:
340341
- id: cpu
341342
name: CPU Information
342343
run: |
343-
echo "model_name=$(grep -m1 'model name' < /proc/cpuinfo | awk '-F: ' '{ print $2}' | tr '-' '_')" >> "$GITHUB_OUTPUT"
344+
cat /proc/cpuinfo
345+
echo "model_name=$(grep -m1 'model name' < /proc/cpuinfo || grep -m1 Features < /proc/cpuinfo | awk '-F: ' '{ print $2}' | tr '-' '_')" >> "$GITHUB_OUTPUT"
344346
- run: sudo apt-get update
345347
- name: ccache
346348
uses: hendrikmuhs/[email protected]
@@ -687,11 +689,11 @@ jobs:
687689
arch_flags: -ffast-math
688690
- version: "14"
689691
distro: ubuntu-24.04-arm
690-
arch_flags: -march=armv8-a+fp+aes+sha2+sha3+sm4+sve+flagm+ssbs+sb+sve2+i8mm+bf16
692+
arch_flags: -march=armv8-a+fp+aes+sha2
691693
# grep Features < /proc/cpuinfo | head -n 1 | awk '-F: ' '{print $2}' | sed 's/asimd //;s/evtstrm //;s/pmull //;s/sha1 //;s/crc32 //;s/atomics //;s/fphp //;s/asimd.. //g;s/cpuid //;s/asimd... //g;s/jscvt //;s/fcma //;s/lrcpc //;s/dcpop //;s/sm3 //;s/sha512 //;s/uscat //;s/ilrcpc //;s/pac. //g;s/dcpodp //;s/sveaes //;s/svebitperm //;s/svesha3 //;s/svesm4 //;s/flagm2 //;s/frint //;s/svei8mm //;s/svebf16 //' | tr ' ' '+'
692694
- version: "14"
693695
distro: ubuntu-24.04-arm
694-
arch_flags: -ffast-math -march=armv8-a+fp+aes+sha2+sha3+sm4+sve+flagm+ssbs+sb+sve2+i8mm+bf16
696+
arch_flags: -ffast-math -march=armv8-a+fp+aes+sha2
695697
- version: "15"
696698
distro: ubuntu-24.04
697699
- version: "15"
@@ -761,7 +763,8 @@ jobs:
761763
- id: cpu
762764
name: CPU Information
763765
run: |
764-
echo "model_name=$(grep -m1 'model name' < /proc/cpuinfo | awk '-F: ' '{ print $2}' | tr '-' '_')" >> "$GITHUB_OUTPUT"
766+
cat /proc/cpuinfo
767+
echo "model_name=$(grep -m1 'model name' < /proc/cpuinfo || grep -m1 Features < /proc/cpuinfo | awk '-F: ' '{ print $2}' | tr '-' '_')" >> "$GITHUB_OUTPUT"
765768
- run: sudo apt-get update
766769
- name: ccache
767770
uses: hendrikmuhs/[email protected]

0 commit comments

Comments
 (0)