brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename flag to NOSIMD=true, NOOPT already in use by DPF

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-12-28 14:50:01 +00:00
parent 2ad135551e
commit 108c462115
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
12 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -877,7 +877,7 @@ jobs:
run: |
source ~/emsdk/emsdk_env.sh
make features
make CIBUILD=true NOPLUGINS=true NOOPT=true STATIC_BUILD=true USE_GLES2=true -j $(nproc)
make CIBUILD=true NOPLUGINS=true NOOPT=true NOSIMD=true STATIC_BUILD=true USE_GLES2=true -j $(nproc)
- name: Make wasm versioned and compress
run: |
VERSION=$(cat Makefile | awk 'sub("VERSION = ","")')

8
deps/Makefile vendored
View file

@ -34,12 +34,12 @@ endif
BASE_FLAGS += -I$(abspath ../include)
BASE_FLAGS += -I$(abspath ../include/simd-compat)
ifeq ($(HAIKU)$(WASM),true)
BASE_FLAGS += -I$(abspath ../include/linux-compat)
ifneq (,$(findstring true,$(DEBUG)$(NOSIMD)))
BASE_FLAGS += -DCARDINAL_NOSIMD
endif
ifeq ($(MOD_BUILD)$(WITH_LTO),true)
BASE_FLAGS += -ffat-lto-objects
ifeq ($(HAIKU)$(WASM),true)
BASE_FLAGS += -I$(abspath ../include/linux-compat)
endif
ifneq ($(SYSDEPS),true)

1
docs/BUILDING.md
View file

@ -23,6 +23,7 @@ Developer related options:
* `DEBUG=true` build non-stripped debug binaries (terrible performance, only useful for developers)
* `NOPLUGINS=true` build only the Cardinal Core plugins (not recommended, only useful for developers)
* `NOSIMD=true` build without SIMD (not recommended, only useful for developers)
Packaging related options:

2
include/simd-compat/emmintrin.h
View file

@ -17,7 +17,7 @@
#pragma once
#if (defined(__i386__) || defined(__x86_64__) || defined(__EMSCRIPTEN__)) && !defined(CARDINAL_NOOPT)
#if (defined(__i386__) || defined(__x86_64__) || defined(__EMSCRIPTEN__)) && !defined(CARDINAL_NOSIMD)
# include_next <emmintrin.h>
#else
# define SIMDE_ENABLE_NATIVE_ALIASES

2
include/simd-compat/immintrin.h
View file

@ -17,7 +17,7 @@
#pragma once
#if (defined(__i386__) || defined(__x86_64__) || defined(__EMSCRIPTEN__)) && !defined(CARDINAL_NOOPT)
#if (defined(__i386__) || defined(__x86_64__) || defined(__EMSCRIPTEN__)) && !defined(CARDINAL_NOSIMD)
# include_next <immintrin.h>
#else
# define SIMDE_ENABLE_NATIVE_ALIASES

4
include/simd-compat/mmintrin.h
View file

@ -17,9 +17,9 @@
#pragma once
#if (defined(__i386__) || defined(__x86_64__)) && !defined(CARDINAL_NOOPT)
#if (defined(__i386__) || defined(__x86_64__)) && !defined(CARDINAL_NOSIMD)
# include_next <mmintrin.h>
#elif defined(__EMSCRIPTEN__) && !defined(CARDINAL_NOOPT)
#elif defined(__EMSCRIPTEN__) && !defined(CARDINAL_NOSIMD)
# include <wasm_simd128.h>
#else
# define SIMDE_ENABLE_NATIVE_ALIASES

4
include/simd-compat/pmmintrin.h
View file

@ -17,7 +17,7 @@
#pragma once
#if (defined(__i386__) || defined(__x86_64__)) && !defined(CARDINAL_NOOPT)
#if (defined(__i386__) || defined(__x86_64__)) && !defined(CARDINAL_NOSIMD)
# include_next <pmmintrin.h>
// bring in extra SSE3 support via simde
@ -40,7 +40,7 @@
# undef _WIN32_WAS_DEFINED
# endif
#elif defined(__EMSCRIPTEN__) && !defined(CARDINAL_NOOPT)
#elif defined(__EMSCRIPTEN__) && !defined(CARDINAL_NOSIMD)
# include_next <pmmintrin.h>
static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))

2
include/simd-compat/xmmintrin.h
View file

@ -17,7 +17,7 @@
#pragma once
#if (defined(__i386__) || defined(__x86_64__) || defined(__EMSCRIPTEN__)) && !defined(CARDINAL_NOOPT)
#if (defined(__i386__) || defined(__x86_64__) || defined(__EMSCRIPTEN__)) && !defined(CARDINAL_NOSIMD)
# include_next <xmmintrin.h>
#else
# define SIMDE_ENABLE_NATIVE_ALIASES

4
plugins/Makefile
View file

@ -1187,8 +1187,8 @@ ifeq ($(HEADLESS),true)
BASE_FLAGS += -DHEADLESS
endif
ifneq (,$(findstring true,$(DEBUG)$(NOOPT)))
BASE_FLAGS += -DCARDINAL_NOOPT
ifneq (,$(findstring true,$(DEBUG)$(NOSIMD)))
BASE_FLAGS += -DCARDINAL_NOSIMD
endif
ifeq ($(BSD)$(WASM),true)

4
src/Makefile
View file

@ -83,8 +83,8 @@ ifeq ($(HEADLESS),true)
BASE_FLAGS += -DHEADLESS
endif
ifneq (,$(findstring true,$(DEBUG)$(NOOPT)))
BASE_FLAGS += -DCARDINAL_NOOPT
ifneq (,$(findstring true,$(DEBUG)$(NOSIMD)))
BASE_FLAGS += -DCARDINAL_NOSIMD
endif
ifeq ($(BSD),true)

4
src/Makefile.cardinal.mk
View file

@ -298,8 +298,8 @@ ifeq ($(HEADLESS),true)
BASE_FLAGS += -DHEADLESS
endif
ifneq (,$(findstring true,$(DEBUG)$(NOOPT)))
BASE_FLAGS += -DCARDINAL_NOOPT
ifneq (,$(findstring true,$(DEBUG)$(NOSIMD)))
BASE_FLAGS += -DCARDINAL_NOSIMD
endif
ifeq ($(MOD_BUILD),true)

2
src/emscripten/shell.html
View file

@ -124,7 +124,7 @@
if (!WebAssembly.validate(new Uint8Array([0,97,115,109,1,0,0,0,2,8,1,1,97,1,98,3,127,1,6,6,1,127,1,65,0,11,7,5,1,1,97,3,1]))) {
wasmErrors.push('Importable/Exportable mutable globals unsupported');
}
if (!WebAssembly.validate(new Uint8Array([0,97,115,109,1,0,0,0,1,5,1,96,0,1,123,3,2,1,0,10,10,1,8,0,65,0,253,15,253,98,11]))) {
if (window.location.host !== "minicardinal.kx.studio" && !WebAssembly.validate(new Uint8Array([0,97,115,109,1,0,0,0,1,5,1,96,0,1,123,3,2,1,0,10,10,1,8,0,65,0,253,15,253,98,11]))) {
wasmErrors.push('Fixed-Width SIMD unsupported');
}
}