Refactor code

Makefile

@@ -1,109 +1,30 @@
 #CONFIGURE BUILD SYSTEM
-IDENTIFIER = $(OPT_SCHEME)-$(TAG)-$(ISA)-$(DATA_TYPE)
-TARGET	   = MDBench-$(IDENTIFIER)
-BUILD_DIR  = ./build-$(IDENTIFIER)
-SRC_DIR    = ./$(OPT_SCHEME)
-ASM_DIR    = ./asm
-COMMON_DIR = ./common
-CUDA_DIR   = ./$(SRC_DIR)/cuda
-MAKE_DIR   = ./
+TAG = $(OPT_TAG)-$(TOOLCHAIN)-$(DATA_TYPE)
+TARGET	   = MDBench-$(TAG)
+BUILD_DIR  = ./build/build-$(TAG)
+SRC_ROOT   = ./src
+SRC_DIR    = $(SRC_ROOT)/$(OPT_SCHEME)
+COMMON_DIR = $(SRC_ROOT)/common
+CUDA_DIR   = $(SRC_DIR)/cuda
+MAKE_DIR   = ./make
 Q         ?= @
 
 #DO NOT EDIT BELOW
-include $(MAKE_DIR)/config.mk
-include $(MAKE_DIR)/include_$(TAG).mk
+include config.mk
+include $(MAKE_DIR)/include_$(TOOLCHAIN).mk
 include $(MAKE_DIR)/include_LIKWID.mk
+ifneq ($(strip $(ISA)),NONE)
 include $(MAKE_DIR)/include_ISA.mk
+endif
 include $(MAKE_DIR)/include_GROMACS.mk
-INCLUDES  += -I./$(SRC_DIR)/includes -I./$(COMMON_DIR)/includes
+INCLUDES  += -I./$(SRC_DIR) -I./$(COMMON_DIR)
 
-ifeq ($(strip $(DATA_LAYOUT)),AOS)
-    DEFINES +=  -DAOS
-endif
-ifeq ($(strip $(DATA_TYPE)),SP)
-    DEFINES +=  -DPRECISION=1
-else
-    DEFINES +=  -DPRECISION=2
-endif
-
-ifneq ($(ASM_SYNTAX), ATT)
-    ASFLAGS += -masm=intel
-endif
-
-ifeq ($(strip $(SORT_ATOMS)),true)
-    DEFINES += -DSORT_ATOMS
-endif
-
-ifeq ($(strip $(EXPLICIT_TYPES)),true)
-    DEFINES += -DEXPLICIT_TYPES
-endif
-
-ifeq ($(strip $(MEM_TRACER)),true)
-    DEFINES += -DMEM_TRACER
-endif
-
-ifeq ($(strip $(INDEX_TRACER)),true)
-    DEFINES += -DINDEX_TRACER
-endif
-
-ifeq ($(strip $(COMPUTE_STATS)),true)
-    DEFINES += -DCOMPUTE_STATS
-endif
-
-ifeq ($(strip $(XTC_OUTPUT)),true)
-    DEFINES += -DXTC_OUTPUT
-endif
-
-ifeq ($(strip $(USE_REFERENCE_VERSION)),true)
-    DEFINES += -DUSE_REFERENCE_VERSION
-endif
-
-ifeq ($(strip $(HALF_NEIGHBOR_LISTS_CHECK_CJ)),true)
-    DEFINES += -DHALF_NEIGHBOR_LISTS_CHECK_CJ
-endif
-
-ifeq ($(strip $(DEBUG)),true)
-    DEFINES += -DDEBUG
-endif
-
-ifneq ($(VECTOR_WIDTH),)
-    DEFINES += -DVECTOR_WIDTH=$(VECTOR_WIDTH)
-endif
-
-ifeq ($(strip $(__SIMD_KERNEL__)),true)
-    DEFINES += -D__SIMD_KERNEL__
-endif
-
-ifeq ($(strip $(__SSE__)),true)
-    DEFINES += -D__ISA_SSE__
-endif
-
-ifeq ($(strip $(__ISA_AVX__)),true)
-    DEFINES += -D__ISA_AVX__
-endif
-
-ifeq ($(strip $(__ISA_AVX_FMA__)),true)
-    DEFINES += -D__ISA_AVX_FMA__
-endif
-
-ifeq ($(strip $(__ISA_AVX2__)),true)
-    DEFINES += -D__ISA_AVX2__
-endif
-
-ifeq ($(strip $(__ISA_AVX512__)),true)
-    DEFINES += -D__ISA_AVX512__
-endif
-
-ifeq ($(strip $(ENABLE_OMP_SIMD)),true)
-    DEFINES += -DENABLE_OMP_SIMD
-endif
-
-VPATH     = $(SRC_DIR) $(ASM_DIR) $(CUDA_DIR)
+VPATH     = $(SRC_DIR) $(COMMON_DIR) $(CUDA_DIR)
 ASM       = $(patsubst $(SRC_DIR)/%.c, $(BUILD_DIR)/%.s,$(wildcard $(SRC_DIR)/*.c))
 OVERWRITE:= $(patsubst $(ASM_DIR)/%-new.s, $(BUILD_DIR)/%.o,$(wildcard $(ASM_DIR)/*-new.s))
 OBJ       = $(filter-out $(BUILD_DIR)/main% $(OVERWRITE),$(patsubst $(SRC_DIR)/%.c, $(BUILD_DIR)/%.o,$(wildcard $(SRC_DIR)/*.c)))
 OBJ      += $(patsubst $(ASM_DIR)/%.s, $(BUILD_DIR)/%.o,$(wildcard $(ASM_DIR)/*.s))
-OBJ      += $(patsubst $(COMMON_DIR)/%.c, $(BUILD_DIR)/%-common.o,$(wildcard $(COMMON_DIR)/*.c))
+OBJ      += $(patsubst $(COMMON_DIR)/%.c, $(BUILD_DIR)/%.o,$(wildcard $(COMMON_DIR)/*.c))
 ifeq ($(strip $(TAG)),NVCC)
 OBJ      += $(patsubst $(CUDA_DIR)/%.cu, $(BUILD_DIR)/%-cuda.o,$(wildcard $(CUDA_DIR)/*.cu))
 endif
@@ -129,11 +50,6 @@ $(BUILD_DIR)/%.o:  %.c
 	$(Q)$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
 	$(Q)$(CC) $(CPPFLAGS) -MT $@ -MM  $< > $(BUILD_DIR)/$*.d
 
-$(BUILD_DIR)/%-common.o:  $(COMMON_DIR)/%.c
-	$(info ===>  COMPILE  $@)
-	$(Q)$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
-	$(Q)$(CC) $(CPPFLAGS) -MT $@ -MM  $< > $(BUILD_DIR)/$*.d
-
 $(BUILD_DIR)/%-cuda.o:  %.cu
 	$(info ===>  COMPILE  $@)
 	$(Q)$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
@@ -152,18 +68,16 @@ $(BUILD_DIR)/%.o:  %.s
 clean:
 	$(info ===>  CLEAN)
 	@rm -rf $(BUILD_DIR)
-	@rm -rf $(TARGET)*
-	@rm -f tags
 
 cleanall:
 	$(info ===>  CLEAN)
-	@rm -rf build-*
+	@rm -rf build
 	@rm -rf MDBench-*
 	@rm -f tags
 
 distclean: clean
 	$(info ===>  DIST CLEAN)
-	@rm -f $(TARGET)*
+	@rm -f $(TARGET)
 	@rm -f tags
 
 info:
@@ -177,6 +91,6 @@ tags:
 	$(Q)ctags -R
 
 $(BUILD_DIR):
-	@mkdir $(BUILD_DIR)
+	@mkdir -p $(BUILD_DIR)
 
 -include $(OBJ:.o=.d)