From b76e6b517c53155c1ab2e410e5926b911d8f61e2 Mon Sep 17 00:00:00 2001 From: Jianzhong Xu Date: Fri, 8 Apr 2016 19:13:42 +0000 Subject: [PATCH] Pass NUM_DSP_CORES to ticblas build since it uses blis.h. --- src/ti/linalg/Makefile | 2 +- src/ti/linalg/ticblas/src/Makefile | 2 +- src/ti/linalg/ticblas/src/ticblas.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ti/linalg/Makefile b/src/ti/linalg/Makefile index b3af5bd..870866b 100644 --- a/src/ti/linalg/Makefile +++ b/src/ti/linalg/Makefile @@ -53,7 +53,7 @@ DSPlibs: cd $(LINALG_CBLAS_DIR); make arch=C66 alllib; \ cd ../$(LINALG_BLIS_DIR); ./configure -p install/$(BLIS_CFG) c66x; \ make -j8 MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS) NUM_DSP_CORES=$(NUM_DSP_CORES); make install; \ - cd ../$(LINALG_TICBLAS_DIR)/src; make MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS); cd ../lib; \ + cd ../$(LINALG_TICBLAS_DIR)/src; make MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS) NUM_DSP_CORES=$(NUM_DSP_CORES); cd ../lib; \ echo "combining BLIS, CBLAS, and TICBLAS libraries into one: libcblas.ae66"; \ mkdir -p objs; cd objs; rm -f *; ar x ../../../blis/install/$(BLIS_CFG)/lib/libblis.ae66; mmv 'cblas*.o' 'blis_cblas#1.o'; \ ar -x ../../../cblas/lib/C66/libcblas.ae66; ar -x ../libticblas.ae66; chmod +rw *;cd ../../..; \ diff --git a/src/ti/linalg/ticblas/src/Makefile b/src/ti/linalg/ticblas/src/Makefile index 6ac4ad5..1e45ca8 100644 --- a/src/ti/linalg/ticblas/src/Makefile +++ b/src/ti/linalg/ticblas/src/Makefile @@ -32,7 +32,7 @@ INCDIR += -I$(BLIS_INC) INCS = -I. -I$(strip $(subst ;, -I,$(subst $(space),$(space),$(INCDIR)))) -CL6X_FLAGS = $(INCS) --openmp --use_g2 -D$(TARGET) -D$(LIBOS) -D$(BLIS_MEM_MODEL) +CL6X_FLAGS = $(INCS) --openmp --use_g2 -D$(TARGET) -D$(LIBOS) -D$(BLIS_MEM_MODEL) -DBLIS_MAX_NUM_THREADS=${NUM_DSP_CORES} DSP_LIB_DIR = ../lib DSP_LIB = $(DSP_LIB_DIR)/libticblas.ae66 diff --git a/src/ti/linalg/ticblas/src/ticblas.c b/src/ti/linalg/ticblas/src/ticblas.c index 6beabc2..3af4e4a 100644 --- a/src/ti/linalg/ticblas/src/ticblas.c +++ b/src/ti/linalg/ticblas/src/ticblas.c @@ -86,10 +86,10 @@ void * blasGetMemHandle() void tiCblasGetSizes(size_t *smem_size_vfast, size_t *smem_size_fast, size_t *smem_size_medium, size_t *smem_size_slow) { - *smem_size_vfast = BLAS_MEM_SIZE_VFAST; // very fast scratch memory - *smem_size_fast = BLAS_MEM_SIZE_FAST; // fast scratch memory - *smem_size_medium = BLAS_MEM_SIZE_MEDIUM; // medium speed scratch memory - *smem_size_slow = BLAS_MEM_SIZE_SLOW; // slow scratch memory + *smem_size_vfast = BLAS_MEM_SIZE_VFAST; /* very fast scratch memory */ + *smem_size_fast = BLAS_MEM_SIZE_FAST; /* fast scratch memory */ + *smem_size_medium = BLAS_MEM_SIZE_MEDIUM; /* medium speed scratch memory */ + *smem_size_slow = BLAS_MEM_SIZE_SLOW; /* slow scratch memory */ /* printf("BLIS_MK_POOL_SIZE_L1 is %d.\n", BLIS_MK_POOL_SIZE_L1); printf("BLIS_KN_POOL_SIZE_L1 is %d.\n", BLIS_KN_POOL_SIZE_L1); -- 2.39.2