Merge branch 'lib'

capi
Avril 3 years ago
commit aea2c6b837
Signed by: flanchan
GPG Key ID: 284488987C31F630

2
.gitignore vendored

@ -2,3 +2,5 @@ obj/
vgcore.* vgcore.*
*-release *-release
*-debug *-debug
*.so*
*.a

@ -1,29 +1,40 @@
# Generic C and C++ Makefile project template # pipec - Piping IPC
# Contains targets for `release', `debug', and `clean'.
PROJECT=rng PROJECT=rngxx
AUTHOR=Avril (Flanchan) <flanchan@cumallover.me> AUTHOR=Avril (Flanchan) <flanchan@cumallover.me>
SRC_C = $(wildcard src/*.c) $(wildcard src/rng/*.c) VERSION_MAJOR=0
SRC_CXX = $(wildcard src/*.cpp) $(wildcard src/rng/*.cpp) VERSION_MINOR=0
VERSION=$(VERSION_MAJOR).$(VERSION_MINOR)
ifeq ($(PREFIX),)
PREFIX := /usr/local
endif
SRC_C = $(wildcard src/*.c)
SRC_CXX = $(wildcard src/*.cpp)
INCLUDE=include INCLUDE=include
COMMON_FLAGS+= -W -Wall -pedantic -fno-strict-aliasing $(addprefix -I,$(INCLUDE)) INCLUDE_INTERNAL=src/internal
COMMON_FLAGS= -W -Wall -Wextra -Wstrict-aliasing -fno-strict-aliasing "-D_VERSION=$(VERSION)" $(addprefix -I,$(INCLUDE)) $(addprefix -I,$(INCLUDE_INTERNAL))
OPT_FLAGS?= -march=native -fgraphite -fopenmp -floop-parallelize-all -ftree-parallelize-loops=4 \ TARGET_CPU?=native
OPT_FLAGS?= $(addprefix -march=,$(TARGET_CPU)) -fgraphite -fopenmp -floop-parallelize-all -ftree-parallelize-loops=4 \
-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block \ -floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block \
-fno-stack-check -fno-stack-check
CXX_OPT_FLAGS?= $(OPT_FLAGS) -felide-constructors CXX_OPT_FLAGS?= $(OPT_FLAGS)
CFLAGS += $(COMMON_FLAGS) --std=gnu17 # Static analyzer currently generates false positives for C++, enable it only for C
CXXFLAGS += $(COMMON_FLAGS) --std=gnu++20 CFLAGS += $(COMMON_FLAGS) --std=gnu17 -fanalyzer
LDFLAGS += CXXFLAGS += $(COMMON_FLAGS) --std=gnu++20 -felide-constructors
LDFLAGS +=
STRIP=strip STRIP=strip
RELEASE_COMMON_FLAGS+= # -Werror RELEASE_COMMON_FLAGS+= -Werror
DEBUG_COMMON_FLAGS+= DEBUG_COMMON_FLAGS+= -fanalyzer
ifneq ($(TARGET_SPEC_FLAGS),no) ifneq ($(TARGET_SPEC_FLAGS),no)
RELEASE_CFLAGS?= -O3 -flto $(OPT_FLAGS) RELEASE_CFLAGS?= -O3 -flto $(OPT_FLAGS)
@ -50,10 +61,33 @@ OBJ = $(OBJ_C) $(OBJ_CXX)
# Phonies # Phonies
.PHONY: release .PHONY: release
release: | dirs $(PROJECT)-release release: | dirs
$(MAKE) lib$(PROJECT).a
@$(MAKE) clean-rebuild >> /dev/null
@$(MAKE) dirs >> /dev/null
$(MAKE) lib$(PROJECT).so
.PHONY: debug .PHONY: debug
debug: | dirs $(PROJECT)-debug debug: | dirs
$(MAKE) lib$(PROJECT)-debug.a
@$(MAKE) clean-rebuild >> /dev/null
@$(MAKE) dirs >> /dev/null
$(MAKE) lib$(PROJECT)-debug.so
# Rebuild both release and debug targets from scratch
.PHONY: all
all: | clean
@$(MAKE) release
@$(MAKE) clean-rebuild
@$(MAKE) debug
.PHONY: install
.PHONY: uninstall
.PHONY: test
test:
@rm -f $(PROJECT)-test
@$(MAKE) $(PROJECT)-test
# Targets # Targets
@ -66,22 +100,65 @@ obj/c/%.o: %.c
obj/cxx/%.o: %.cpp obj/cxx/%.o: %.cpp
$(CXX) -c $< $(CXXFLAGS) -o $@ $(LDFLAGS) $(CXX) -c $< $(CXXFLAGS) -o $@ $(LDFLAGS)
$(PROJECT)-release: CFLAGS+= $(RELEASE_CFLAGS) lib$(PROJECT)-release.a: CFLAGS+= $(RELEASE_CFLAGS)
$(PROJECT)-release: CXXFLAGS += $(RELEASE_CXXFLAGS) lib$(PROJECT)-release.a: CXXFLAGS += $(RELEASE_CXXFLAGS)
$(PROJECT)-release: LDFLAGS += $(RELEASE_LDFLAGS) lib$(PROJECT)-release.a: LDFLAGS += $(RELEASE_LDFLAGS)
$(PROJECT)-release: $(OBJ) lib$(PROJECT)-release.a: $(OBJ)
$(CXX) $^ $(CXXFLAGS) -o $@ $(LDFLAGS) ar rcs $@ $^
ranlib $@
lib$(PROJECT)-debug.a: CFLAGS+= $(DEBUG_CFLAGS)
lib$(PROJECT)-debug.a: CXXFLAGS += $(DEBUG_CXXFLAGS)
lib$(PROJECT)-debug.a: LDFLAGS += $(DEBUG_LDFLAGS)
lib$(PROJECT)-debug.a: $(OBJ)
ar rcs $@ $^
ranlib $@
lib$(PROJECT)-release.so: CFLAGS+= $(RELEASE_CFLAGS) -fPIC
lib$(PROJECT)-release.so: CXXFLAGS += $(RELEASE_CXXFLAGS) -fPIC
lib$(PROJECT)-release.so: LDFLAGS += $(RELEASE_LDFLAGS)
lib$(PROJECT)-release.so: $(OBJ)
$(CXX) -shared $^ $(CXXFLAGS) -o $@ $(LDFLAGS)
$(STRIP) $@ $(STRIP) $@
$(PROJECT)-debug: CFLAGS+= $(DEBUG_CFLAGS) lib$(PROJECT)-debug.so: CFLAGS+= $(DEBUG_CFLAGS) -fPIC
$(PROJECT)-debug: CXXFLAGS += $(DEBUG_CXXFLAGS) lib$(PROJECT)-debug.so: CXXFLAGS += $(DEBUG_CXXFLAGS) -fPIC
$(PROJECT)-debug: LDFLAGS += $(DEBUG_LDFLAGS) lib$(PROJECT)-debug.so: LDFLAGS += $(DEBUG_LDFLAGS)
$(PROJECT)-debug: $(OBJ) lib$(PROJECT)-debug.so: $(OBJ)
$(CXX) $^ $(CXXFLAGS) -o $@ $(LDFLAGS) $(CXX) -shared $^ $(CXXFLAGS) -o $@ $(LDFLAGS)
lib$(PROJECT).a: lib$(PROJECT)-release.a
ln -f $< $@
lib$(PROJECT).so: LDFLAGS+= -Wl,-soname,lib$(PROJECT).so.$(VERSION_MAJOR)
lib$(PROJECT).so: lib$(PROJECT)-release.so
ln -f $< $@.$(VERSION)
ln -sf $@.$(VERSION) $@.$(VERSION_MAJOR)
ln -sf $@.$(VERSION_MAJOR) $@
clean-rebuild: clean-rebuild:
rm -rf obj rm -rf obj
clean: clean-rebuild clean: clean-rebuild
rm -f $(PROJECT)-{release,debug,pgo} rm -f lib$(PROJECT){,-{release,debug,pgo}}.{a,so{,.*}}
rm -f $(PROJECT)-test
install:
install -d $(DESTDIR)$(PREFIX)/lib/
install -m 644 lib$(PROJECT).a $(DESTDIR)$(PREFIX)/lib/
install -s -m 755 lib$(PROJECT).so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/
ln -sf lib$(PROJECT).so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/lib$(PROJECT).so.$(VERSION_MAJOR)
ln -sf lib$(PROJECT).so.$(VERSION_MAJOR) $(DESTDIR)$(PREFIX)/lib/lib$(PROJECT).so
install -d $(DESTDIR)$(PREFIX)/include/
install -m 644 $(wildcard $(INCLUDE)/*.*) $(DESTDIR)$(PREFIX)/include/
install -d $(DESTDIR)$(PREFIX)/include/$(PROJECT)/
install -m 644 $(wildcard $(INCLUDE)/$(PROJECT)/*.*) $(DESTDIR)$(PREFIX)/include/$(PROJECT)/
uninstall:
-rm $(DESTDIR)$(PREFIX)/lib/lib$(PROJECT).{a,so{,.*}}
cd $(INCLUDE) && find . -type f | xargs -I {} rm "$(DESTDIR)$(PREFIX)/include/{}"
-rmdir $(DESTDIR)$(PREFIX)/include/$(PROJECT)
$(PROJECT)-test: lib$(PROJECT).so
$(CXX) $(CXXFLAGS) src/test/*.cpp -o $@ -l:$< -lfmt -Wl,-flto -Wl,-O3 $(LDFLAGS)
-valgrind ./$@

@ -6,7 +6,7 @@
#include <climits> #include <climits>
#include "common.h" #include "rngxx/common.h"
#define CTOR_COPY(name) name(const name& copy) #define CTOR_COPY(name) name(const name& copy)
#define CTOR_MOVE(name) name(name&& move) #define CTOR_MOVE(name) name(name&& move)

@ -1,5 +1,5 @@
#ifndef _INTS_H #ifndef _RNG__COMMON_H
#define _INTS_H #define _RNG__COMMON_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -69,4 +69,4 @@ typedef uintptr_t ptr_t;
} }
#endif #endif
#endif /* _INTS_H */ #endif /* _RNG__COMMON_H */

@ -0,0 +1 @@
../../include/rngxx/common.h

@ -1,42 +0,0 @@
#include <rng.h>
#include <rng/crand.h>
#include <cstdio>
using namespace rng;
void r(Random& r)
{
u8 bytes[32];
r.next_bytes(bytes);
u32 n = r.next<u32>();
f64 f = r.next<f64>();
f = r.next_f64();
std::array<char, 10> nn = r.next<std::array<char, 10>>();
}
void rng_test()
{
crand r(123);
printf("%lu %lu %lu\n", r.next_u64(), r.next_u64(), r.next_u64());
printf("%d %d %d\n", r.next_i32(), r.next_i32(), r.next_i32());
printf("%u %u %u\n", r.next_u32(), r.next_u32(), r.next_u32());
union {
volatile u64 u;
u8 b[sizeof(u64)];
std::array<u8, sizeof(u64)> a;
} thing = {0};
r.next_bytes(thing.b, sizeof(u64));
printf("chaos: %lu, %lu, %lu\n", thing.u, (r.next_bytes(thing.a), thing.u), (r.next_bytes(thing.b), thing.u));
// TODO: these aren't implemented yet in the base Random huh...
printf("---\n%u %d %d %u\n", r.next_u32(10, 20), r.next_i32(10, 20), r.next_i32(10), r.next_u32(10));
}
int main()
{
rng_test();
return 0;
}

@ -1,5 +1,5 @@
#include <rng.h> #include <rngxx.h>
#include <range.h> #include <range.h>
constexpr const static util::range<f64> SAMPLE_RANGE { 0.0, 1.0 }; constexpr const static util::range<f64> SAMPLE_RANGE { 0.0, 1.0 };

Loading…
Cancel
Save