X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=fhi_lib%2Flib%2FMakefile;h=579a0c6600db47939796502aad22ebff71afd332;hb=70d9d920dd4e575f085f1f1a9050fefd1c10e127;hp=2977afc7845135999248d86cae00c7e13875f4f5;hpb=5ed6345902100aa6fc7d9528f5c8abdc0d3f0e3f;p=o-du%2Fphy.git

diff --git a/fhi_lib/lib/Makefile b/fhi_lib/lib/Makefile
index 2977afc..579a0c6 100644
--- a/fhi_lib/lib/Makefile
+++ b/fhi_lib/lib/Makefile
@@ -16,7 +16,6 @@
 #*
 #*******************************************************************************/
 
-
 MYCUSTOMTAB='     '
 MYCUSTOMSPACE='============================================================================================'
 MYCUSTOMSPACE1='------------------------------------------------------------'
@@ -24,18 +23,11 @@ MYCUSTOMSPACE1='------------------------------------------------------------'
 ##############################################################
 #  Tools configuration
 ##############################################################
-ifeq ($(BUILD_GCC),)
 CC  := icc
-LD := icc
-else
-CC := gcc
-LD := gcc
-endif
-
 CPP := icpc
 AS := as
 AR := ar
-
+LD := icc
 OBJDUMP := objdump
 
 ifeq ($(SHELL),cmd.exe)
@@ -52,13 +44,18 @@ PROJECT_NAME := libxran
 PROJECT_TYPE := lib
 PROJECT_DIR  := $(XRAN_DIR)/lib
 BUILDDIR := ./build
+
+ifeq ($(XRAN_LIB_SO),)
 PROJECT_BINARY := $(BUILDDIR)/$(PROJECT_NAME).a
+else
+PROJECT_BINARY := $(BUILDDIR)/$(PROJECT_NAME).so
+endif
 
 ifeq ($(RTE_SDK),)
     $(error "Please define RTE_SDK environment variable")
 endif
 
-RTE_TARGET ?= x86_64-native-linuxapp-gcc
+RTE_TARGET ?= x86_64-native-linux-icc
 RTE_INC := $(RTE_SDK)/$(RTE_TARGET)/include
 
 API_DIR := $(PROJECT_DIR)/api
@@ -84,49 +81,26 @@ CC_SRC = $(ETH_DIR)/ethdi.c \
 	$(SRC_DIR)/xran_app_frag.c \
 	$(SRC_DIR)/xran_main.c
 
-#CPP_SRC = $(SRC_DIR)/xran_compression.cpp
-ifeq ($(BUILD_GCC),)
+CPP_SRC = $(SRC_DIR)/xran_compression.cpp \
+	$(SRC_DIR)/xran_bfp_ref.cpp \
+	$(SRC_DIR)/xran_bfp_cplane8.cpp \
+	$(SRC_DIR)/xran_bfp_cplane16.cpp \
+	$(SRC_DIR)/xran_bfp_cplane32.cpp \
+	$(SRC_DIR)/xran_bfp_cplane64.cpp
+
 CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations  \
 	-fdata-sections \
 	-ffunction-sections \
 	-g \
+        -fPIC \
 	-Wall \
 	-Wimplicit-function-declaration \
-        -g -O3
+	-g -O3 -wd1786
 
 CPP_FLAGS := -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D_GNU_SOURCE -D_REENTRANT -pipe -no-prec-div \
-                -no-prec-div -fp-model fast=2\
+                -no-prec-div -fp-model fast=2 -fPIC \
                 -no-prec-sqrt  -falign-functions=16 -fast-transcendentals \
         -Werror -Wno-unused-variable -std=c++11 -mcmodel=large
-else
-CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations -Wextra \
-	-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations \
-        -Wold-style-definition -Wpointer-arith -Wcast-align -Wnested-externs \
-        -Wcast-qual -Wformat-nonliteral -Wformat-security -Wundef -Wwrite-strings \
-        -Wdeprecated -Wunused-parameter -Wunused-variable\
-        -fdata-sections \
-	-ffunction-sections \
-	-g \
-	-Wimplicit-function-declaration \
-	-m64 \
-	-pthread \
-	-march=native \
-	-DRTE_MACHINE_CPUFLAG_SSE \
-	-DRTE_MACHINE_CPUFLAG_SSE2 \
-	-DRTE_MACHINE_CPUFLAG_SSE3 \
- 	-DRTE_MACHINE_CPUFLAG_SSSE3 \
-	-DRTE_MACHINE_CPUFLAG_SSE4_1 \
-	-DRTE_MACHINE_CPUFLAG_SSE4_2 \
-	-DRTE_MACHINE_CPUFLAG_AES \
-	-DRTE_MACHINE_CPUFLAG_PCLMULQDQ \
-	-DRTE_MACHINE_CPUFLAG_AVX \
-	-DRTE_MACHINE_CPUFLAG_RDRAND \
-	-DRTE_MACHINE_CPUFLAG_FSGSBASE \
- 	-DRTE_MACHINE_CPUFLAG_F16C \
-	-DRTE_MACHINE_CPUFLAG_AVX2 \
-	-I$(API_DIR) -I$(ETH_DIR) -I$(MLOG_DIR)/source -I$(RTE_INC) -g -O3 \
-	-DALLOW_EXPERIMENTAL_API 
-endif
 
 INC :=  -I$(API_DIR) -I$(ETH_DIR) -I$(SRC_DIR) -I$(RTE_INC)
 DEF :=
@@ -137,6 +111,8 @@ else
 	DEF += -UMLOG_ENABLED
 endif
 
+#DEF += -DFCN_ADAPT
+
 AS_FLAGS :=
 AR_FLAGS := rc
 
@@ -152,9 +128,9 @@ CC_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(CC_OBJS))
 CPP_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(CPP_OBJS))
 
 AS_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(AS_OBJS))
-
+CPP_COMP       := -O3 -xcore-avx512 -restrict -g -fasm-blocks
 CC_FLAGS_FULL  := $(CC_FLAGS)  $(INC) $(DEF)
-CPP_FLAGS_FULL := $(CPP_FLAGS) $(INC) $(DEF)
+CPP_FLAGS_FULL := $(CPP_FLAGS) $(CPP_COMP) $(INC) $(DEF)
 
 AS_FLAGS := $(AS_FLAGS) $(INC)
 
@@ -235,7 +211,10 @@ welcome_line :
 
 debug :  all
 release :  all
-
 $(PROJECT_BINARY) : $(DIRLIST) echo_start_build $(GENERATE_DEPS) $(PRE_BUILD) $(CC_OBJTARGETS) $(CPP_OBJTARGETS) $(AS_OBJTARGETS)
 	@echo [AR]    $(subst $(BUILDDIR)/,,$@)
+ifeq ($(XRAN_LIB_SO),)
 	@$(AR) $(AR_FLAGS) $@ $(CC_OBJTARGETS) $(CPP_OBJTARGETS) $(AS_OBJTARGETS)
+else
+	@$(CC) $(CC_OBJTARGETS) $(CPP_OBJTARGETS) $(AS_OBJTARGETS) -shared -fPIC -o $@
+endif