Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
telephone001 authored Dec 14, 2023
2 parents 42b5e83 + 559a658 commit 46aaf25
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cmake-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Downloading wasi-sdk
run: |
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
C_FLAGS: ['', '-msimd128', '-msse -msse2 -msimd128', '-msse -msse2 -msse3 -msse4 -msimd128']
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup emsdk
uses: mymindstorm/setup-emsdk@v12

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/meson-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
C_FLAGS: ['', '-msimd128', '-msse -msse2 -msimd128', '-msse -msse2 -msse3 -msse4 -msimd128']
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup emsdk
uses: mymindstorm/setup-emsdk@v13

Expand Down
39 changes: 39 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Read the Docs configuration file for Sphinx projects
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Set the OS, Python version and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.12"
# You can also specify other tool versions:
# nodejs: "20"
# rust: "1.70"
# golang: "1.20"

# Build documentation in the "docs/" directory with Sphinx
sphinx:
configuration: docs/source/conf.py
# You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
# builder: "dirhtml"
# Fail on all warnings to avoid broken references
# fail_on_warning: true

# Optionally build your docs in additional formats such as PDF and ePub
# formats:
# - pdf
# - epub

# Optional but recommended, declare the Python requirements required
# to build your documentation
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
# python:
# install:
# - requirements: docs/requirements.txt

python:
install:
- requirements: docs/requirements.txt
4 changes: 4 additions & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Defining the exact version will make sure things don't break
sphinx==5.3.0
sphinx_rtd_theme==1.1.1
readthedocs-sphinx-search==0.1.1
2 changes: 1 addition & 1 deletion include/cglm/simd/arm.h
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ glmm_fnmadd(float32x4_t a, float32x4_t b, float32x4_t c) {
static inline
float32x4_t
glmm_fmsub(float32x4_t a, float32x4_t b, float32x4_t c) {
return glmm_fmadd(vnegq_f32(c), a, b);
return glmm_fmadd(a, b, vnegq_f32(c));
}

static inline
Expand Down
36 changes: 36 additions & 0 deletions test/tests.h
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,12 @@ TEST_DECLARE(glmc_vec2_muladd)
TEST_DECLARE(glmc_vec2_muladds)
TEST_DECLARE(glmc_vec2_maxadd)
TEST_DECLARE(glmc_vec2_minadd)
TEST_DECLARE(glmc_vec2_subsub)
TEST_DECLARE(glmc_vec2_addsub)
TEST_DECLARE(glmc_vec2_mulsub)
TEST_DECLARE(glmc_vec2_mulsubs)
TEST_DECLARE(glmc_vec2_maxsub)
TEST_DECLARE(glmc_vec2_minsub)
TEST_DECLARE(glmc_vec2_negate_to)
TEST_DECLARE(glmc_vec2_negate)
TEST_DECLARE(glmc_vec2_normalize)
Expand Down Expand Up @@ -675,6 +681,12 @@ TEST_DECLARE(glmc_vec3_muladd)
TEST_DECLARE(glmc_vec3_muladds)
TEST_DECLARE(glmc_vec3_maxadd)
TEST_DECLARE(glmc_vec3_minadd)
TEST_DECLARE(glmc_vec3_subsub)
TEST_DECLARE(glmc_vec3_addsub)
TEST_DECLARE(glmc_vec3_mulsub)
TEST_DECLARE(glmc_vec3_mulsubs)
TEST_DECLARE(glmc_vec3_maxsub)
TEST_DECLARE(glmc_vec3_minsub)
TEST_DECLARE(glmc_vec3_negate_to)
TEST_DECLARE(glmc_vec3_negate)
TEST_DECLARE(glmc_vec3_normalize)
Expand Down Expand Up @@ -835,6 +847,12 @@ TEST_DECLARE(glmc_vec4_muladd)
TEST_DECLARE(glmc_vec4_muladds)
TEST_DECLARE(glmc_vec4_maxadd)
TEST_DECLARE(glmc_vec4_minadd)
TEST_DECLARE(glmc_vec4_subsub)
TEST_DECLARE(glmc_vec4_addsub)
TEST_DECLARE(glmc_vec4_mulsub)
TEST_DECLARE(glmc_vec4_mulsubs)
TEST_DECLARE(glmc_vec4_maxsub)
TEST_DECLARE(glmc_vec4_minsub)
TEST_DECLARE(glmc_vec4_negate_to)
TEST_DECLARE(glmc_vec4_negate)
TEST_DECLARE(glmc_vec4_normalize)
Expand Down Expand Up @@ -1532,6 +1550,12 @@ TEST_LIST {
TEST_ENTRY(glmc_vec2_muladds)
TEST_ENTRY(glmc_vec2_maxadd)
TEST_ENTRY(glmc_vec2_minadd)
TEST_ENTRY(glmc_vec2_subsub)
TEST_ENTRY(glmc_vec2_addsub)
TEST_ENTRY(glmc_vec2_mulsub)
TEST_ENTRY(glmc_vec2_mulsubs)
TEST_ENTRY(glmc_vec2_maxsub)
TEST_ENTRY(glmc_vec2_minsub)
TEST_ENTRY(glmc_vec2_negate_to)
TEST_ENTRY(glmc_vec2_negate)
TEST_ENTRY(glmc_vec2_normalize)
Expand Down Expand Up @@ -1674,6 +1698,12 @@ TEST_LIST {
TEST_ENTRY(glmc_vec3_muladds)
TEST_ENTRY(glmc_vec3_maxadd)
TEST_ENTRY(glmc_vec3_minadd)
TEST_ENTRY(glmc_vec3_subsub)
TEST_ENTRY(glmc_vec3_addsub)
TEST_ENTRY(glmc_vec3_mulsub)
TEST_ENTRY(glmc_vec3_mulsubs)
TEST_ENTRY(glmc_vec3_maxsub)
TEST_ENTRY(glmc_vec3_minsub)
TEST_ENTRY(glmc_vec3_negate_to)
TEST_ENTRY(glmc_vec3_negate)
TEST_ENTRY(glmc_vec3_normalize)
Expand Down Expand Up @@ -1834,6 +1864,12 @@ TEST_LIST {
TEST_ENTRY(glmc_vec4_muladds)
TEST_ENTRY(glmc_vec4_maxadd)
TEST_ENTRY(glmc_vec4_minadd)
TEST_ENTRY(glmc_vec4_subsub)
TEST_ENTRY(glmc_vec4_addsub)
TEST_ENTRY(glmc_vec4_mulsub)
TEST_ENTRY(glmc_vec4_mulsubs)
TEST_ENTRY(glmc_vec4_maxsub)
TEST_ENTRY(glmc_vec4_minsub)
TEST_ENTRY(glmc_vec4_negate_to)
TEST_ENTRY(glmc_vec4_negate)
TEST_ENTRY(glmc_vec4_normalize)
Expand Down

0 comments on commit 46aaf25

Please sign in to comment.