atrstm

commit 24bda7d3a9a0cb1130689da445642e328c9f2d1a
parent 6db52c1c29ddf18c017e7fe933295c1d890f5a62
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Thu,  2 Nov 2023 11:56:47 +0100

Merge branch 'release_0.1.1'

Diffstat:
M
Makefile
 | 
15
++++++++++++---
M
README.md
 | 
6
++++++
M
config.mk
 | 
3
++-

3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
@@ -26,7 +26,7 @@ LIBNAME = $(LIBNAME_$(LIB_TYPE))
 ################################################################################
 # Library building
 ################################################################################
-SRC =\
+SRC_REGULAR =\
  src/atrstm.c\
  src/atrstm_cache.c\
  src/atrstm_dump_svx_octree.c\
@@ -37,11 +37,20 @@ SRC =\
  src/atrstm_setup_octrees.c\
  src/atrstm_setup_uvm.c\
  src/atrstm_svx.c
+SRC_SIMD =\
+ $(SRC_REGULAR)\
+ src/atrstm_radcoefs_simd4.c
+SRC = $(SRC_$(INSTRUCTION_SET))
 OBJ = $(SRC:.c=.o)
 DEP = $(SRC:.c=.d)
 
 build_library: .config $(DEP)
 	@$(MAKE) -fMakefile $$(for i in $(DEP); do echo -f $${i}; done) \
+	$$(if $(RSIMD_EXISTS); then \
+	     echo "INSTRUCTION_SET=SIMD"; \
+	   else \
+	     echo "INSTRUCTION_SET=REGULAR"; \
+	   fi) \
 	$$(if [ -n "$(LIBNAME)" ]; then \
 	     echo "$(LIBNAME)"; \
 	   else \
@@ -142,11 +151,11 @@ uninstall:
 all: build_library build_tests
 
 clean: clean_test
-	rm -f $(OBJ) $(TEST_OBJ) $(LIBNAME)
+	rm -f $(SRC_COMMON:.c=.o) $(SRC_SIMD:.c=.o) $(TEST_OBJ) $(LIBNAME)
 	rm -f .config .test libatrstm.o atrstm.pc atrstm-local.pc
 
 distclean: clean
-	rm -f $(DEP) $(TEST_DEP)
+	rm -f $(SRC_COMMON:.c=.d) $(SRC_SIMD:.c=.d) $(TEST_DEP)
 
 lint:
 	shellcheck -o all make.sh
diff --git a/README.md b/README.md
@@ -24,6 +24,12 @@ Edit config.mk as needed, then run:
 
 ## Release notes
 
+### Version 0.1.1
+
+- Fix compilation with SIMD support: when the rsimd library was found,
+  the library depended on it, but without activating the SIMD
+  instruction set.
+
 ### Version 0.1
 
 - Replace CMake by Makefile as build system.
diff --git a/config.mk b/config.mk
@@ -1,4 +1,4 @@
-VERSION = 0.1.0
+VERSION = 0.1.1
 PREFIX = /usr/local
 
 LIB_TYPE = SHARED
@@ -96,6 +96,7 @@ CFLAGS_COMMON =\
  -pedantic\
  -fvisibility=hidden\
  -fstrict-aliasing\
+ $$($(RSIMD_EXISTS) && echo "-DATRSTM_USE_SIMD")\
  $(CFLAGS_HARDENED)\
  $(WFLAGS)