Skip to content

Commit

Permalink
Try run on apple silicon.
Browse files Browse the repository at this point in the history
  • Loading branch information
sheredom committed Jan 31, 2024
1 parent f3cfd9a commit 96e2088
Show file tree
Hide file tree
Showing 3 changed files with 518 additions and 263 deletions.
23 changes: 17 additions & 6 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,20 @@ jobs:
build:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
os: [ubuntu-latest, windows-latest, macos-11, macos-14]
type: [Debug, RelWithDebInfo, MinSizeRel, Release]
compiler: [default, clang, gcc]
compiler: [default, clang, gcc, tcc]
exclude:
- {os: "macOS-latest", compiler: "clang"}
- {os: "windows-latest", compiler: "gcc"}
- {os: "macOS-latest", compiler: "gcc"}
- {os: "macos-11", compiler: "clang"}
- {os: "macos-11", compiler: "gcc"}
- {os: "macos-11", compiler: "tcc"}
- {os: "macos-14", compiler: "clang"}
- {os: "macos-14", compiler: "gcc"}
- {os: "macos-14", compiler: "tcc"}
- {os: "ubuntu-latest", compiler: "default"}
- {os: "ubuntu-latest", compiler: "default"}
- {os: "windows-latest", compiler: "gcc"}
- {os: "windows-latest", compiler: "tcc"}
runs-on: ${{ matrix.os }}

steps:
Expand All @@ -29,7 +34,7 @@ jobs:

- name: Setup dependencies
if: startsWith(matrix.os, 'ubuntu')
run: sudo apt-get install -y gcc-10 g++-10 clang
run: sudo apt-get install -y gcc-10 g++-10 clang tcc

- name: Configure CMake
shell: bash
Expand All @@ -43,6 +48,12 @@ jobs:
working-directory: ${{github.workspace}}/build
run: cmake $GITHUB_WORKSPACE/test -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10

- name: Configure CMake with TCC (Ubuntu)
shell: bash
if: matrix.compiler == 'tcc' && startsWith(matrix.os, 'ubuntu')
working-directory: ${{github.workspace}}/build
run: cmake $GITHUB_WORKSPACE/test -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_C_COMPILER=tcc -DCMAKE_CXX_COMPILER=g++-10

- name: Configure CMake with Clang (Ubuntu)
shell: bash
if: (matrix.compiler == 'clang') && startsWith(matrix.os, 'ubuntu')
Expand Down
23 changes: 19 additions & 4 deletions hashmap.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,20 @@
#pragma clang diagnostic ignored "-Wstatic-in-inline"
#endif

#if defined(__TINYC__)
#define HASHMAP_ATTRIBUTE(a) __attribute((a))
#else
#define HASHMAP_ATTRIBUTE(a) __attribute__((a))
#endif

#if defined(_MSC_VER)
#define HASHMAP_WEAK __inline
#elif defined(__clang__) || defined(__GNUC__)
#define HASHMAP_WEAK __attribute__((weak))
#elif defined(__MINGW32__) || defined(__MINGW64__)
#define HASHMAP_WEAK static HASHMAP_ATTRIBUTE(used)
#elif defined(__clang__) || defined(__GNUC__) || defined(__TINYC__)
#define HASHMAP_WEAK HASHMAP_ATTRIBUTE(weak)
#else
#error Non clang, non gcc, non MSVC compiler found!
#error Non clang, non gcc, non MSVC, non tcc compiler found!
#endif

#if defined(_MSC_VER)
Expand Down Expand Up @@ -701,7 +709,14 @@ HASHMAP_ALWAYS_INLINE hashmap_uint32_t hashmap_clz(const hashmap_uint32_t x) {
#if defined(_MSC_VER)
unsigned long result;
_BitScanReverse(&result, x);
return 31 - HASHMAP_CAST(hashmap_uint32_t, result);
return 31u - HASHMAP_CAST(hashmap_uint32_t, result);
#elif defined(__TINYC__)
union {
double d;
hashmap_uint64_t u;
} u;
u.d = HASHMAP_CAST(double, x) + 0.5;
return 1054u - HASHMAP_CAST(hashmap_uint32_t, u.u >> 52);
#else
return HASHMAP_CAST(hashmap_uint32_t, __builtin_clz(x));
#endif
Expand Down
Loading

0 comments on commit 96e2088

Please sign in to comment.