Skip to content

Commit

Permalink
remove unused entries in Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
herumi committed Jan 10, 2025
1 parent 0c2c7a2 commit c7d5272
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 55 deletions.
53 changes: 2 additions & 51 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PYTHON?=python3
INC_DIR= -I../src -I./include -I./test
CFLAGS += $(INC_DIR) -O2 -DNDEBUG -std=c++20 -mfma
CFLAGS += $(INC_DIR) -O2 -DNDEBUG
CFLAGS_WARN=-Wall -Wextra -Wformat=2 -Wcast-qual -Wcast-align -Wwrite-strings -Wfloat-equal -Wpointer-arith
CFLAGS+=$(CFLAGS_WARN)
LDFLAGS=-L lib -lfmath
Expand Down Expand Up @@ -39,70 +39,21 @@ update:
$(MAKE) src/fmath.S src/fmath.asm

obj/%.o: %.cpp include/fmath.h test/table.h
$(CXX) -c -o $@ $< $(CFLAGS) -MMD -MP -MF $(@:.o=.d)
$(CXX) -c -o $@ $< $(CFLAGS) -MMD -MP -MF $(@:.o=.d) -std=c++20 -mfma

obj/cpu.o: cpu.cpp include/fmath.h
$(CXX) -c -o $@ $< $(CFLAGS) -MMD -MP -MF $(@:.o=.d) -fno-exceptions -fno-rtti -fno-threadsafe-statics #-fvisibility=hidden

bin/%.exe: obj/%.o $(LIB)
$(CXX) -o $@ $< $(LDFLAGS)

bench: bench.o
$(CXX) -o $@ $<

fastexp: fastexp.o
$(CXX) -o $@ $<

avx2: avx2.cpp fmath.hpp
$(CXX) -o $@ $< -O3 -mavx2 -mtune=native -Iinclude

EXP_UN?=4
exp_unroll_n: obj/exp_v.o
@$(PYTHON) src/gen_fmath.py -m gas -exp_un $(EXP_UN) > src/fmath$(EXP_UN).S
@$(CXX) -o bin/exp_v$(EXP_UN).exe obj/exp_v.o src/fmath$(EXP_UN).S $(CFLAGS) -I ../include
@bin/exp_v$(EXP_UN).exe b
@bin/exp_v$(EXP_UN).exe b
@bin/exp_v$(EXP_UN).exe b
@bin/exp_v$(EXP_UN).exe b
@bin/exp_v$(EXP_UN).exe b
@bin/exp_v$(EXP_UN).exe b
@bin/exp_v$(EXP_UN).exe b
@bin/exp_v$(EXP_UN).exe b
@bin/exp_v$(EXP_UN).exe b
@bin/exp_v$(EXP_UN).exe b

exp_unroll: obj/exp_v.o
@sh -ec 'for i in 1 2 3 4 5 6 7 8; do echo EXP_UN=$$i; make -s exp_unroll_n EXP_UN=$$i; done'

LOG_MODE?=allreg
LOG_UN?=4
log_unroll_n: obj/log_v.o
@$(PYTHON) src/gen_fmath.py -m gas -log_un $(LOG_UN) -log_mode $(LOG_MODE) > src/fmath$(LOG_UN).S
@$(CXX) -o bin/log_v$(LOG_UN).exe obj/log_v.o src/fmath$(LOG_UN).S $(CFLAGS) -I ../include
@bin/log_v$(LOG_UN).exe b
@bin/log_v$(LOG_UN).exe b
@bin/log_v$(LOG_UN).exe b
@bin/log_v$(LOG_UN).exe b
@bin/log_v$(LOG_UN).exe b
@bin/log_v$(LOG_UN).exe b
@bin/log_v$(LOG_UN).exe b
@bin/log_v$(LOG_UN).exe b
@bin/log_v$(LOG_UN).exe b
@bin/log_v$(LOG_UN).exe b

log_unroll: obj/log_v.o
@sh -ec 'for i in 1 2 3 4 5; do echo LOG_UN=$$i; make -s log_unroll_n LOG_UN=$$i; done'

clean:
$(RM) obj/*.o obj/*.d $(TARGET) bin/*.exe src/*.S

test: bin/exp_v.exe bin/log_v.exe
bin/exp_v.exe
bin/log_v.exe

bench.o: bench.cpp $(HEADER)
fastexp.o: fastexp.cpp $(HEADER)

.PHONY: test clean

# don't remove these files automatically
Expand Down
6 changes: 2 additions & 4 deletions src/fmath.S
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,9 @@ PRE(log2_log2):
.long 0x3f317218,0x3f317218,0x3f317218,0x3f317218,0x3f317218,0x3f317218,0x3f317218,0x3f317218
.balign 64
PRE(log2_tbl1):
.long 0x3f800000,0x3f639220,0x3f4ccccd,0x3f3a2e8c,0x3faaaaab,0x3f9d89d9,0x3f924777,0x3f888507
.long 0x3f800000,0x3f639220,0x3f4ccccd,0x3f3a2e8c,0x3faaae92,0x3f9d8dbf,0x3f924777,0x3f888507
PRE(log2_tbl2):
.long 0x0,0x3df1151c,0x3e647fbd,0x3ea30c5d,0xbe934b12,0xbe549f6c,0xbe08b0b5,0xbd83f82e
PRE(log2_i7):
.long 7,7,7,7,7,7,7,7
.long 0x0,0x3df1151c,0x3e647fbd,0x3ea30c5d,0xbe9356c6,0xbe54b8c3,0xbe08b0b5,0xbd83f82e
.text
.balign 16
.global PRE(fmath_expf_v_avx512)
Expand Down

0 comments on commit c7d5272

Please sign in to comment.