Addressing issues found by Klockwork

8 files changed, 35 insertions, 19 deletions

diff --git a/src/ti/linalg/blis/frame/1m/packm/bli_packm_blk_var2.c b/src/ti/linalg/blis/frame/1m/packm/bli_packm_blk_var2.c
index 75e4091..b1ddf84 100644
--- a/src/ti/linalg/blis/frame/1m/packm/bli_packm_blk_var2.c
+++ b/src/ti/linalg/blis/frame/1m/packm/bli_packm_blk_var2.c
@@ -144,6 +144,9 @@ void bli_packm_blk_var2( obj_t*   c,
                         kappa_p = &BLIS_ONE;
                 }
         }
+        else {
+        kappa_p = NULL;
+        }
         kappa_p = thread_obroadcast( t, kappa_p );
 
 
diff --git a/src/ti/linalg/blis/frame/3/gemm/bli_gemm_blk_var1f.c b/src/ti/linalg/blis/frame/3/gemm/bli_gemm_blk_var1f.c
index f739d56..fd421d8 100644
--- a/src/ti/linalg/blis/frame/3/gemm/bli_gemm_blk_var1f.c
+++ b/src/ti/linalg/blis/frame/3/gemm/bli_gemm_blk_var1f.c
@@ -248,7 +248,10 @@ void bli_gemm_blk_var1f( obj_t*  a,
                                 cntl_sub_unpackm_c( cntl ),
                                 gemm_thread_sub_ipackm( thread ) );
 
-                bli_obj_alias_to(c2, c1);
+                if(i < end) // Only if i < end do we want to DMA the next block
+                {
+                                bli_obj_alias_to(c2, c1);
+                        }
         }
     }
 
diff --git a/src/ti/linalg/blis/frame/3/herk/bli_herk_blk_var1f.c b/src/ti/linalg/blis/frame/3/herk/bli_herk_blk_var1f.c
index 7817434..492d246 100644
--- a/src/ti/linalg/blis/frame/3/herk/bli_herk_blk_var1f.c
+++ b/src/ti/linalg/blis/frame/3/herk/bli_herk_blk_var1f.c
@@ -456,8 +456,10 @@ void bli_herk_blk_var1f( obj_t*  a,
                                 cntl_sub_unpackm_c( cntl ),
                                 herk_thread_sub_ipackm( thread ) );
 
-                bli_obj_alias_to(c2, c1);
-
+                if(i < end) // Only if i < end do we want to DMA the next block
+                {
+                                bli_obj_alias_to(c2, c1);
+                        }
         }
     }
 #else
diff --git a/src/ti/linalg/blis/frame/3/herk/bli_herk_l_ker_var2.c b/src/ti/linalg/blis/frame/3/herk/bli_herk_l_ker_var2.c
index 0ffd2b4..a046708 100644
--- a/src/ti/linalg/blis/frame/3/herk/bli_herk_l_ker_var2.c
+++ b/src/ti/linalg/blis/frame/3/herk/bli_herk_l_ker_var2.c
@@ -670,13 +670,16 @@ void PASTEMAC(ch,varname)( \
                 ptr_dest   += cs_c; \
             } \
         } \
-                c1_new     = c1_next; \
-                a1_new     = a1_next; \
-                mc_new     = mc_next; \
-                m_iter_new = m_iter_next; \
-                m_left_new = m_left_next; \
-                diagoffc_j = diagoffc_j_next; \
-                cs_c11     = cs_c11_next; \
+                if(j < (n_iter-jr_num_threads)) /* no transfer for last iteration */ \
+                {\
+                        c1_new     = c1_next; \
+                        a1_new     = a1_next; \
+                        mc_new     = mc_next; \
+                        m_iter_new = m_iter_next; \
+                        m_left_new = m_left_next; \
+                        diagoffc_j = diagoffc_j_next; \
+                        cs_c11     = cs_c11_next; \
+                }\
         } \
         if (BLIS_ENABLE_PROFILE_KERVAR2 == 1) \
         { \
diff --git a/src/ti/linalg/blis/frame/3/trmm/bli_trmm_blk_var1f.c b/src/ti/linalg/blis/frame/3/trmm/bli_trmm_blk_var1f.c
index 32ae4af..1003313 100644
--- a/src/ti/linalg/blis/frame/3/trmm/bli_trmm_blk_var1f.c
+++ b/src/ti/linalg/blis/frame/3/trmm/bli_trmm_blk_var1f.c
@@ -449,7 +449,10 @@ void bli_trmm_blk_var1f( obj_t*  a,
                                 cntl_sub_unpackm_c( cntl ),
                                 trmm_thread_sub_ipackm( thread ) );
 
-                bli_obj_alias_to(c2, c1);
+                if(i < end) // Only if i < end do we want to DMA the next block
+                {
+                                bli_obj_alias_to(c2, c1);
+                        }
         }
     }
 
diff --git a/src/ti/linalg/blis/frame/3/trsm/bli_trsm_blk_var1b.c b/src/ti/linalg/blis/frame/3/trsm/bli_trsm_blk_var1b.c
index c6154d1..c85eee2 100644
--- a/src/ti/linalg/blis/frame/3/trsm/bli_trsm_blk_var1b.c
+++ b/src/ti/linalg/blis/frame/3/trsm/bli_trsm_blk_var1b.c
@@ -232,7 +232,10 @@ void bli_trsm_blk_var1b( obj_t*  a,
                 }
 #endif
 #ifdef BLIS_ENABLE_C66X_EDMA
-                bli_obj_alias_to(c2, c1);
+                if( (i+b_alg) < end ) //Making sure we aren't at the end of the matrix
+                {
+                        bli_obj_alias_to(c2, c1);
+                }
 #endif
         }
 
diff --git a/src/ti/linalg/blis/frame/3/trsm/bli_trsm_blk_var1f.c b/src/ti/linalg/blis/frame/3/trsm/bli_trsm_blk_var1f.c
index 8296455..8c7d159 100644
--- a/src/ti/linalg/blis/frame/3/trsm/bli_trsm_blk_var1f.c
+++ b/src/ti/linalg/blis/frame/3/trsm/bli_trsm_blk_var1f.c
@@ -204,7 +204,10 @@ void bli_trsm_blk_var1f( obj_t*  a,
                       trsm_thread_sub_trsm( thread ) );
 
 #ifdef BLIS_ENABLE_C66X_EDMA
-                bli_obj_alias_to(c2, c1);
+                if( (i+b_alg) < end ) //Making sure we aren't at the end of the matrix
+                {
+                        bli_obj_alias_to(c2, c1);
+                }
 #endif
         }
 
diff --git a/src/ti/linalg/blis/frame/base/bli_dma.c b/src/ti/linalg/blis/frame/base/bli_dma.c
index f1ee815..be509d9 100755
--- a/src/ti/linalg/blis/frame/base/bli_dma.c
+++ b/src/ti/linalg/blis/frame/base/bli_dma.c
@@ -510,6 +510,8 @@ void bli_dma_var1( obj_t*   a,
         uplo_p      = bli_obj_uplo( *p );
         diagoff_p   = bli_obj_diag_offset( *p );
 
+        m_transfer = m_p;
+        n_transfer = n_p;
         if(!bli_obj_root_is_general( *p ) && bli_obj_intersects_diag( *p ) && !(bli_is_triangular( struc_p )))
         {
                 //printf("not general and diag intersects\n");
@@ -532,12 +534,6 @@ void bli_dma_var1( obj_t*   a,
                         }
                 }
         }
-        else
-        {
-                m_transfer = m_p;
-                n_transfer = n_p;
-        }
-
 
         //If source is column major
         if( bli_is_col_stored( rs_source, cs_source ) )