From 72730bc27b46a25c5652d45e4f7e5ce985d74e38 Mon Sep 17 00:00:00 2001
From: Rafael Ravedutti <rafaelravedutti@gmail.com>
Date: Mon, 17 Jan 2022 14:16:39 +0100
Subject: [PATCH] Update Makefile and config.mk

Signed-off-by: Rafael Ravedutti <rafaelravedutti@gmail.com>
---
 Makefile  | 6 +++---
 config.mk | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index da24a29..3535aa5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #CONFIGURE BUILD SYSTEM
-TARGET	   = MDBench-$(TAG)
+TARGET	   = MDBench-$(TAG)-$(OPT_SCHEME)
 BUILD_DIR  = ./$(TAG)
-SRC_DIR    = ./src
+SRC_DIR    = ./$(OPT_SCHEME)
 ASM_DIR    = ./asm
 MAKE_DIR   = ./
 Q         ?= @
@@ -10,7 +10,7 @@ Q         ?= @
 include $(MAKE_DIR)/config.mk
 include $(MAKE_DIR)/include_$(TAG).mk
 include $(MAKE_DIR)/include_LIKWID.mk
-INCLUDES  += -I./src/includes
+INCLUDES  += -I./$(SRC_DIR)/includes
 
 ifeq ($(strip $(DATA_LAYOUT)),AOS)
 DEFINES +=  -DAOS
diff --git a/config.mk b/config.mk
index 0765626..ba5414b 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,7 @@
 # Compiler tag (GCC/CLANG/ICC)
-TAG ?= CLANG
+TAG ?= ICC
+# Optimization scheme (default/gromacs/clusters_per_bin)
+OPT_SCHEME = default
 # Enable likwid (true or false)
 ENABLE_LIKWID ?= false
 # SP or DP