Skip to content

Commit 356931a

Browse files
authored
Add macOS arm64 support and CI testing (#2406)
1 parent ff03168 commit 356931a

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ jobs:
3030
runs-on: ${{ matrix.os }}
3131
strategy:
3232
matrix:
33-
os: [ubuntu-latest, macos-12, windows-latest]
33+
os: [ubuntu-latest, macos-12, macos-14, windows-latest]
3434
steps:
35-
- uses: actions/setup-python@v1
35+
- uses: actions/setup-python@v5
3636
with:
3737
python-version: '3.x'
3838
- uses: actions/checkout@v1
@@ -43,7 +43,7 @@ jobs:
4343
if: matrix.os == 'ubuntu-latest'
4444
- name: install ninja (osx)
4545
run: brew install ninja
46-
if: matrix.os == 'macos-12'
46+
if: matrix.os == 'macos-12' || matrix.os == 'macos-14'
4747
- name: install ninja (win)
4848
run: choco install ninja
4949
if: matrix.os == 'windows-latest'

src/prebuilt/wasm2c_simd_source_declarations.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ const char* s_simd_source_declarations = R"w2c_template(#if defined(__GNUC__) &&
22
)w2c_template"
33
R"w2c_template(#define SIMD_FORCE_READ(var) __asm__("" ::"x"(var));
44
)w2c_template"
5+
R"w2c_template(#elif defined(__GNUC__) && defined(__aarch64__)
6+
)w2c_template"
7+
R"w2c_template(#define SIMD_FORCE_READ(var) __asm__("" ::"w"(var));
8+
)w2c_template"
59
R"w2c_template(#else
610
)w2c_template"
711
R"w2c_template(#define SIMD_FORCE_READ(var)

src/template/wasm2c_simd.declarations.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#if defined(__GNUC__) && defined(__x86_64__)
22
#define SIMD_FORCE_READ(var) __asm__("" ::"x"(var));
3+
#elif defined(__GNUC__) && defined(__aarch64__)
4+
#define SIMD_FORCE_READ(var) __asm__("" ::"w"(var));
35
#else
46
#define SIMD_FORCE_READ(var)
57
#endif

0 commit comments

Comments
 (0)