A 2nd implementation conforming to vector creation [need optimization]

This commit is contained in:
2020-11-30 18:42:09 +02:00
parent 2398be8e50
commit e3b96138c8
11 changed files with 863 additions and 161 deletions
+61 -7
View File
@@ -38,9 +38,10 @@ DEP_DIR := $(BUILD_DIR)/.dep
# ========== Compiler settings ==========
# Compiler flags for debug and release
DEB_CFLAGS := -DDEBUG -g3 -Wall -Wextra -std=c++14
REL_CFLAGS := -Wall -Wextra -O2 -std=c++14
REL_CFLAGS := -DDEBUG -g3 -Wall -Wextra -O2 -std=c++14
# Pre-defines
# PRE_DEFS := MYCAB=1729 SUPER_MODE
PRE_DEFS :=
# ============== Linker settings ==============
# Linker flags (example: -pthread -lm)
@@ -105,7 +106,7 @@ DEP := $(foreach file,$(SRC:%.cpp=%.d),$(DEP_DIR)/$(file))
# Invoke cpp to create makefile rules with dependencies for each source file
$(DEP_DIR)/%.d: %.cpp
@mkdir -p $(@D)
@$(DOCKER) $(CXX) -E $(CFLAGS) $(INC) $(DEF) -MM -MT $(OBJ_DIR)/$(<:.cpp=.o) -MF $@ $<
$(DOCKER) $(CXX) -E $(CFLAGS) $(INC) $(DEF) -MM -MT $(OBJ_DIR)/$(<:.cpp=.o) -MF $@ $<
# objects depent on .cpp AND dependency files, which have an empty recipe
$(OBJ_DIR)/%.o: %.cpp $(DEP_DIR)/%.d
@@ -137,29 +138,82 @@ clean:
@rm -rf $(DEP_DIR)
@rm -rf $(BUILD_DIR)
#
# ================ Local build rules =================
# examples:
# make debug
.PHONY: debug
debug: CFLAGS := $(DEB_CFLAGS)
debug: $(BUILD_DIR)/$(TARGET)
.PHONY: release
release: CFLAGS := $(REL_CFLAGS)
release: $(BUILD_DIR)/$(TARGET)
.PHONY: all
all: release
local_v3: CFLAGS := $(DEB_CFLAGS) -DCODE_VERSION=V3
local_v3: TARGET := local_v3
local_v3: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
local_v4: CFLAGS := $(DEB_CFLAGS) -DCODE_VERSION=V4
local_v4: TARGET := local_v4
local_v4: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
v3: DOCKER := $(DOCKER_CMD)
v3: CFLAGS := $(REL_CFLAGS) -DCODE_VERSION=V3
v3: TARGET := tcount_v3
v3: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
v3_cilk: DOCKER := $(DOCKER_CMD)
v3_cilk: CXX := /usr/local/OpenCilk-9.0.1-Linux/bin/clang++
v3_cilk: CFLAGS := $(REL_CFLAGS) -fcilkplus -DCODE_VERSION=V3 -DCILK
v3_cilk: LDFLAGS += -fcilkplus
v3_cilk: TARGET := tcount_cilkv3
v3_cilk: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
v3_omp: DOCKER := $(DOCKER_CMD)
v3_omp: CFLAGS := $(REL_CFLAGS) -fopenmp -DCODE_VERSION=V3 -DOMP
v3_omp: LDFLAGS += -fopenmp
v3_omp: TARGET := tcount_ompv3
v3_omp: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
v4: DOCKER := $(DOCKER_CMD)
v4: CFLAGS := $(REL_CFLAGS) -DCODE_VERSION=V4
v4: TARGET := tcount_v4
v4: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
v4_cilk: DOCKER := $(DOCKER_CMD)
v4_cilk: CXX := /usr/local/OpenCilk-9.0.1-Linux/bin/clang++
v4_cilk: CFLAGS := $(REL_CFLAGS) -fcilkplus -DCODE_VERSION=V4 -DCILK
v4_cilk: LDFLAGS += -fcilkplus
v4_cilk: TARGET := tcount_cilkv4
v4_cilk: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
v4_omp: DOCKER := $(DOCKER_CMD)
v4_omp: CFLAGS := $(REL_CFLAGS) -fopenmp -DCODE_VERSION=V4 -DOMP
v4_omp: LDFLAGS += -fopenmp
v4_omp: TARGET := tcount_ompv4
v4_omp: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
v4_pthreads: DOCKER := $(DOCKER_CMD)
v4_pthreads: CFLAGS := $(REL_CFLAGS) -DCODE_VERSION=V4 -DTHREADS
v4_pthreads: TARGET := tcount_pthv4
v4_pthreads: $(BUILD_DIR)/$(TARGET)
cp $(BUILD_DIR)/$(TARGET) out/$(TARGET)
#
# ================ Docker based rules ================
# examples:
# make IMAGE="gcc:8.3" dock
#
.PHONY: dock
dock: DOCKER := $(DOCKER_CMD)
dock: CFLAGS := $(REL_CFLAGS)
dock: $(BUILD_DIR)/$(TARGET)