Pass NUM_DSP_CORES to ticblas build since it uses blis.h.

[dense-linear-algebra-libraries/linalg.git] / src / ti / linalg / ticblas / src / ticblas.c

diff --git a/src/ti/linalg/ticblas/src/ticblas.c b/src/ti/linalg/ticblas/src/ticblas.c
index 4f62d794ddc0254950319344fb146d0909f30cfe..3af4e4a6716493a81f566ada50c18218e574879d 100644 (file)
--- a/src/ti/linalg/ticblas/src/ticblas.c
+++ b/src/ti/linalg/ticblas/src/ticblas.c
@@ -25,38 +25,12 @@
  *   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF\r
  *   THE POSSIBILITY OF SUCH DAMAGE.\r
  *****************************************************************************/\r
-#include "libarch.h"\r
+#include <ti/libarch/libarch.h>\r
 #include "../ticblas.h"\r
 #include "blis.h"\r
 \r
 #define getNextMultiple(x, y) ( ( ((x)+(y)-1)/(y) )* (y) )\r
 \r
-#if 0\r
-#ifdef MEM_MODEL_LARGE\r
-#define BLAS_LEVEL3_L1DSRAM_SIZE  (28*1024UL)\r
-#define BLAS_LEVEL3_L2SRAM_SIZE   (767*1024UL) /* 767KB */\r
-#define BLAS_LEVEL3_MSMC_SIZE     (0x47FDC0)   /* 4.5MB */\r
-#else\r
-#  ifdef MEM_MODEL_MEDIUM\r
-#    define BLAS_LEVEL3_L1DSRAM_SIZE  (28*1024UL)\r
-#    define BLAS_LEVEL3_L2SRAM_SIZE   (384*1024UL) /* 384KB */\r
-#    define BLAS_LEVEL3_MSMC_SIZE     (0x380000)   /* 3.5MB */\r
-#  else\r
-#    ifdef MEM_MODEL_SMALL\r
-#      define BLAS_LEVEL3_L1DSRAM_SIZE  (18*1024UL)\r
-#      define BLAS_LEVEL3_L2SRAM_SIZE   (183*1024UL) /* 187KB */\r
-#      define BLAS_LEVEL3_MSMC_SIZE     (1520*1024UL)/* 1.5MB */\r
-#    else\r
-#      error "Unsupported memory model"\r
-#    endif\r
-#  endif\r
-#endif\r
-#endif\r
-/*\r
-#define BLAS_MEM_SIZE_VFAST   BLAS_LEVEL3_L1DSRAM_SIZE  \r
-#define BLAS_MEM_SIZE_FAST    BLAS_LEVEL3_L2SRAM_SIZE\r
-#define BLAS_MEM_SIZE_MEDIUM  BLAS_LEVEL3_MSMC_SIZE\r
-*/\r
 #define BLAS_MEM_SIZE_VFAST (  getNextMultiple(BLIS_MK_POOL_SIZE_L1, BLIS_CACHE_LINE_SIZE) \\r
                              + getNextMultiple(BLIS_KN_POOL_SIZE_L1, BLIS_CACHE_LINE_SIZE) \\r
                              + getNextMultiple(BLIS_MN_POOL_SIZE_L1, BLIS_CACHE_LINE_SIZE) )\r
@@ -112,10 +86,10 @@ void * blasGetMemHandle()
 void tiCblasGetSizes(size_t *smem_size_vfast,  size_t *smem_size_fast, \r
                      size_t *smem_size_medium, size_t *smem_size_slow)\r
 {\r
-    *smem_size_vfast  = BLAS_MEM_SIZE_VFAST;  // very fast scratch memory\r
-    *smem_size_fast   = BLAS_MEM_SIZE_FAST;   // fast scratch memory\r
-    *smem_size_medium = BLAS_MEM_SIZE_MEDIUM; // medium speed scratch memory\r
-    *smem_size_slow   = BLAS_MEM_SIZE_SLOW;   // slow scratch memory\r
+    *smem_size_vfast  = BLAS_MEM_SIZE_VFAST;  /* very fast scratch memory     */\r
+    *smem_size_fast   = BLAS_MEM_SIZE_FAST;   /* fast scratch memory          */\r
+    *smem_size_medium = BLAS_MEM_SIZE_MEDIUM; /* medium speed scratch memory  */ \r
+    *smem_size_slow   = BLAS_MEM_SIZE_SLOW;   /* slow scratch memory          */\r
 /*\r
     printf("BLIS_MK_POOL_SIZE_L1 is %d.\n", BLIS_MK_POOL_SIZE_L1);\r
     printf("BLIS_KN_POOL_SIZE_L1 is %d.\n", BLIS_KN_POOL_SIZE_L1);\r