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

diff --git a/fhi_lib/lib/Makefile b/fhi_lib/lib/Makefile
index 2977afc..eccc4ae 100644
--- a/fhi_lib/lib/Makefile
+++ b/fhi_lib/lib/Makefile
@@ -1,6 +1,6 @@
 #/******************************************************************************
 #*
-#*   Copyright (c) 2019 Intel.
+#*   Copyright (c) 2020 Intel.
 #*
 #*   Licensed under the Apache License, Version 2.0 (the "License");
 #*   you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 #*
 #*******************************************************************************/
 
-
 MYCUSTOMTAB='     '
 MYCUSTOMSPACE='============================================================================================'
 MYCUSTOMSPACE1='------------------------------------------------------------'
@@ -24,17 +23,21 @@ MYCUSTOMSPACE1='------------------------------------------------------------'
 ##############################################################
 #  Tools configuration
 ##############################################################
-ifeq ($(BUILD_GCC),)
+ifeq ($(WIRELESS_SDK_TOOLCHAIN),icc)
 CC  := icc
-LD := icc
-else
-CC := gcc
-LD := gcc
-endif
-
 CPP := icpc
 AS := as
 AR := ar
+LD := icc
+else ifeq ($(WIRELESS_SDK_TOOLCHAIN),icx)
+    CC  := icx
+    CPP := icpx
+    AS  := as
+    AR  := llvm-ar
+    LD  := icx
+else
+    $(error "Please define WIRELESS_SDK_TOOLCHAIN environment variable")
+endif
 
 OBJDUMP := objdump
 
@@ -48,18 +51,28 @@ CP := cp -f
 RM := rm -rf
 endif
 
+ifeq ($(ORU),1)
+	PROJECT_NAME := libxran-oru
+	BUILDDIR := build-oru
+else
 PROJECT_NAME := libxran
+	BUILDDIR := build
+endif
 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_INC := $(RTE_SDK)/$(RTE_TARGET)/include
+RTE_TARGET ?= x86_64-native-linux-icc
+RTE_INC := $(shell PKG_CONFIG_PATH=/usr/lib64/pkgconfig:$(RTE_SDK)/build/meson-uninstalled pkgconf --cflags-only-I libdpdk)
 
 API_DIR := $(PROJECT_DIR)/api
 SRC_DIR := $(PROJECT_DIR)/src
@@ -81,53 +94,62 @@ CC_SRC = $(ETH_DIR)/ethdi.c \
 	$(SRC_DIR)/xran_common.c        \
 	$(SRC_DIR)/xran_ul_tables.c     \
 	$(SRC_DIR)/xran_frame_struct.c  \
-	$(SRC_DIR)/xran_app_frag.c \
-	$(SRC_DIR)/xran_main.c
+	$(SRC_DIR)/xran_dev.c \
+	$(SRC_DIR)/xran_rx_proc.c \
+	$(SRC_DIR)/xran_tx_proc.c \
+	$(SRC_DIR)/xran_cp_proc.c \
+	$(SRC_DIR)/xran_cb_proc.c \
+	$(SRC_DIR)/xran_mem_mgr.c \
+	$(SRC_DIR)/xran_main.c \
+	$(SRC_DIR)/xran_delay_measurement.c
+
+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 \
+	$(SRC_DIR)/xran_bfp_uplane_9b16rb.cpp \
+	$(SRC_DIR)/xran_bfp_uplane.cpp \
+	$(SRC_DIR)/xran_mod_compression.cpp
+
+CPP_SRC_SNC = $(SRC_DIR)/xran_compression_snc.cpp \
+	$(SRC_DIR)/xran_bfp_cplane8_snc.cpp \
+	$(SRC_DIR)/xran_bfp_cplane16_snc.cpp \
+	$(SRC_DIR)/xran_bfp_cplane32_snc.cpp \
+	$(SRC_DIR)/xran_bfp_cplane64_snc.cpp \
+	$(SRC_DIR)/xran_bfp_uplane_snc.cpp
 
-#CPP_SRC = $(SRC_DIR)/xran_compression.cpp
-ifeq ($(BUILD_GCC),)
 CC_FLAGS += -std=gnu11 -Wall -Wno-deprecated-declarations  \
 	-fdata-sections \
 	-ffunction-sections \
 	-g \
+        -fPIC \
 	-Wall \
 	-Wimplicit-function-declaration \
-        -g -O3
+	-g -O3 -mcmodel=large
 
-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-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 
+ifeq ($(WIRELESS_SDK_TOOLCHAIN),icc)
+CC_FLAGS += -wd1786 -restrict
 endif
 
+ifeq ($(WIRELESS_SDK_TOOLCHAIN),icx)
+CC_FLAGS += -march=icelake-server -mintrinsic-promote -Wno-unused-function -Wno-intrinsic-promote -Wno-error
+endif
+
+CPP_FLAGS := -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D_GNU_SOURCE -D_REENTRANT -pipe \
+                  -falign-functions=16 \
+        -Werror -Wno-unused-variable -std=c++14 -mcmodel=large -fPIC
+
+ifeq ($(WIRELESS_SDK_TOOLCHAIN),icc)
+CPP_FLAGS +=  -fp-model fast=2 -no-prec-div -no-prec-sqrt -fast-transcendentals -restrict
+endif
+
+ifeq ($(WIRELESS_SDK_TOOLCHAIN),icx)
+CPP_FLAGS +=  -fp-model fast -march=icelake-server -mintrinsic-promote -Wno-unused-function -Wno-intrinsic-promote -Wno-error
+endif
+
+
 INC :=  -I$(API_DIR) -I$(ETH_DIR) -I$(SRC_DIR) -I$(RTE_INC)
 DEF :=
 ifeq ($(MLOG),1)
@@ -137,24 +159,38 @@ else
 	DEF += -UMLOG_ENABLED
 endif
 
+ifeq ($(ORU),1)
+	DEF += -DXRAN_O_RU_BUILD
+else
+	DEF += -UXRAN_O_RU_BUILD
+endif
+
+#DEF += -DFCN_ADAPT
+#DEF += -DFCN_1_2_6_EARLIER
+
 AS_FLAGS :=
 AR_FLAGS := rc
 
-PROJECT_OBJ_DIR := build/obj
+PROJECT_OBJ_DIR := $(BUILDDIR)/obj
 
 CC_OBJS := $(patsubst %.c,%.o,$(CC_SRC))
 CPP_OBJS := $(patsubst %.cpp,%.o,$(CPP_SRC))
+CPP_OBJS_SNC := $(patsubst %.cpp,%.o,$(CPP_SRC_SNC))
 AS_OBJS := $(patsubst %.s,%.o,$(AS_SRC))
-OBJS    := $(CC_OBJS) $(CPP_OBJS) $(AS_OBJS) $(LIBS)
+OBJS    := $(CC_OBJS) $(CPP_OBJS) $(CPP_OBJS_SNC) $(AS_OBJS) $(LIBS)
 DIRLIST := $(addprefix $(PROJECT_OBJ_DIR)/,$(sort $(dir $(OBJS))))
 
 CC_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(CC_OBJS))
 CPP_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(CPP_OBJS))
+CPP_SNC_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(CPP_OBJS_SNC))
 
 AS_OBJTARGETS := $(addprefix $(PROJECT_OBJ_DIR)/,$(AS_OBJS))
-
+#-qopt-report=5 -qopt-matmul -qopt-report-phase=all
+CPP_COMP       := -O3 -DNDEBUG  -xcore-avx512 -fPIE -fasm-blocks
+CPP_COMP_SNC   := -O3 -DNDEBUG -march=icelake-server -fPIE -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)
+CPP_FLAGS_FULL_SNC := $(CPP_FLAGS) $(CPP_COMP_SNC) $(INC) $(DEF)
 
 AS_FLAGS := $(AS_FLAGS) $(INC)
 
@@ -166,6 +202,7 @@ else
 
 CC_DEPS  := $(addprefix __dep__,$(subst ../,__up__,$(CC_SRC)))
 CPP_DEPS  := $(addprefix __dep__,$(subst ../,__up__,$(CPP_SRC)))
+CPP_SNC_DEPS  := $(addprefix __dep__,$(subst ../,__up__,$(CPP_SRC_SNC)))
 GENERATE_DEPS := generate_deps
 endif
 
@@ -183,8 +220,11 @@ $(CC_DEPS) :
 $(CPP_DEPS) :
 	@$(CPP) -MM $(subst __up__,../,$(subst __dep__,,$@)) -MT $(PROJECT_OBJ_DIR)/$(patsubst %.cpp,%.o,$(subst __up__,../,$(subst __dep__,,$@))) $(CPP_FLAGS_FULL) >> $(PROJECT_DEP_FILE)
 
+$(CPP_SNC_DEPS) :
+	@$(CPP) -MM $(subst __up__,../,$(subst __dep__,,$@)) -MT $(PROJECT_OBJ_DIR)/$(patsubst %.cpp,%.o,$(subst __up__,../,$(subst __dep__,,$@))) $(CPP_FLAGS_FULL_SNC) >> $(PROJECT_DEP_FILE)
+
 .PHONY : generate_deps
-generate_deps : clear_dep $(CC_DEPS) $(CPP_DEPS)
+generate_deps : clear_dep $(CC_DEPS) $(CPP_DEPS) $(CPP_SNC_DEPS)
 
 
 .PHONY : echo_start_build
@@ -202,6 +242,10 @@ $(CPP_OBJTARGETS) :
 	@echo [CPP]    $(subst $(PROJECT_OBJ_DIR)/,,$@)
 	@$(CPP) -c $(CPP_FLAGS_FULL) -o"$@" $(patsubst %.o,%.cpp,$(subst $(PROJECT_OBJ_DIR)/,,$@))
 
+$(CPP_SNC_OBJTARGETS) :
+	@echo [CPP-SNC]    $(subst $(PROJECT_OBJ_DIR)/,,$@)
+	@$(CPP) -c $(CPP_FLAGS_FULL_SNC) -o"$@" $(patsubst %.o,%.cpp,$(subst $(PROJECT_OBJ_DIR)/,,$@))
+
 $(AS_OBJTARGETS) :
 	@echo [AS]    $(subst $(PROJECT_OBJ_DIR)/,,$@)
 	@$(AS) $(AS_FLAGS) -o"$@" $(patsubst %.o,%.s,$(subst $(PROJECT_OBJ_DIR)/,,$@))
@@ -215,7 +259,7 @@ endif
 .PHONY: clean xclean
 clean:
 	@echo [CLEAN]  : $(PROJECT_NAME)
-	@$(RM) $(CC_OBJTARGETS) $(CPP_OBJTARGETS) $(AS_OBJTARGETS)
+	@$(RM) $(CC_OBJTARGETS) $(CPP_OBJTARGETS) $(CPP_SNC_OBJTARGETS) $(AS_OBJTARGETS)
 
 xclean: clean
 ifneq ($(wildcard $(PROJECT_DIR)/$(PROJECT_MAKE)),)
@@ -236,6 +280,10 @@ welcome_line :
 debug :  all
 release :  all
 
-$(PROJECT_BINARY) : $(DIRLIST) echo_start_build $(GENERATE_DEPS) $(PRE_BUILD) $(CC_OBJTARGETS) $(CPP_OBJTARGETS) $(AS_OBJTARGETS)
+$(PROJECT_BINARY) : $(DIRLIST) echo_start_build $(GENERATE_DEPS) $(PRE_BUILD) $(CC_OBJTARGETS) $(CPP_OBJTARGETS) $(CPP_SNC_OBJTARGETS) $(AS_OBJTARGETS)
 	@echo [AR]    $(subst $(BUILDDIR)/,,$@)
-	@$(AR) $(AR_FLAGS) $@ $(CC_OBJTARGETS) $(CPP_OBJTARGETS) $(AS_OBJTARGETS)
+ifeq ($(XRAN_LIB_SO),)
+	@$(AR) $(AR_FLAGS) $@ $(CC_OBJTARGETS) $(CPP_OBJTARGETS) $(CPP_SNC_OBJTARGETS) $(AS_OBJTARGETS)
+else
+	@$(CC) $(CC_OBJTARGETS) $(CPP_OBJTARGETS) $(CPP_SNC_OBJTARGETS) $(AS_OBJTARGETS) -shared -fPIC -o $@
+endif