Resolving merge conflicts

Author: ginginsha

README.developers.md

@@ -115,13 +115,13 @@ To submit a build to coverity do the following:
 
 1. [Download](https://scan.coverity.com/download) the coverity build tool
 
-2. Configure VTR to perform a *debug* build. This ensures that all assertions are enabled, without assertions coverity may report bugs that are gaurded against by assertions.
+2. Configure VTR to perform a *debug* build. This ensures that all assertions are enabled, without assertions coverity may report bugs that are gaurded against by assertions. We also set VTR asserts to the highest level.
 
     ```shell
     #From the VTR root
     mkdir -p build
     cd build
-    CC=gcc CXX=g++ cmake -DCMAKE_BUILD_TYPE=debug ..
+    CC=gcc CXX=g++ cmake -DCMAKE_BUILD_TYPE=debug -DVTR_ASSERT_LEVEL=3 ..
     ```
 
 Note that we explicitly asked for gcc and g++, the coverity build tool defaults to these compilers, and may not like the default 'cc' or 'c++' (even if they are linked to gcc/g++).
@@ -136,7 +136,7 @@ Note that we explicitly asked for gcc and g++, the coverity build tool defaults
 4. Archive the output directory
 
     ```shell
-    tar -czvf cov-int vtr_coverity.tar.gz
+    tar -czvf vtr_coverity.tar.gz cov-int
     ```
 
 5. Submit the archive through the coverity web interface

README.md

@@ -93,6 +93,6 @@ Professors: Kenneth Kent, Vaughn Betz, Jonathan Rose, Jason Anderson, Peter Jami
 
 Graduate Students: Kevin Murray, Jason Luu, Oleg Petelin, Jeffrey Goeders, Chi Wai Yu, Andrew Somerville, Ian Kuon, Alexander Marquardt, Andy Ye, Wei Mark Fang, Tim Liu, Charles Chiasson, Panagiotis (Panos) Patros
 
-Summer Students: Opal Densmore, Ted Campbell, Cong Wang, Peter Milankov, Scott Whitty, Michael Wainberg, Suya Liu, Miad Nasr, Nooruddin Ahmed, Thien Yu, Long Yu Wang, Matthew J.P. Walker, Amer Hesson, Sheng Zhong, Hanqing Zeng, Vidya Sankaranarayanan, Eugene Sha
+Summer Students: Opal Densmore, Ted Campbell, Cong Wang, Peter Milankov, Scott Whitty, Michael Wainberg, Suya Liu, Miad Nasr, Nooruddin Ahmed, Thien Yu, Long Yu Wang, Matthew J.P. Walker, Amer Hesson, Sheng Zhong, Hanqing Zeng, Vidya Sankaranarayanan, Jia Min Wang, Eugene Sha
 
 Companies: Altera Corporation, Texas Instruments

libarchfpga/src/read_xml_arch_file.cpp

@@ -49,7 +49,7 @@
 #include "vtr_assert.h"
 #include "vtr_log.h"
 #include "vtr_util.h"
-#include "vtr_matrix.h"
+#include "vtr_memory.h"
 #include "vtr_digest.h"
 
 #include "arch_types.h"

libvtrutil/src/vtr_matrix.cpp

@@ -4,6 +4,7 @@
 #include "vtr_matrix.h"
 #include "vtr_util.h"
 #include "vtr_error.h"
+#include "vtr_memory.h"
 
 namespace vtr {
 
@@ -17,70 +18,10 @@ void free_ivec_vector(t_ivec *ivec_vector, int nrmin, int nrmax) {
 		if (ivec_vector[i].nelem != 0)
 			free(ivec_vector[i].list);
 
-    //coverity[offset_free]
+    // coverity[offset_free]
 	free(ivec_vector + nrmin);
 }
 
-void free_ivec_matrix(t_ivec **ivec_matrix, int nrmin, int nrmax,
-		int ncmin, int ncmax) {
-
-	/* Frees a 2D matrix of integer vectors (ivecs).                     */
-
-	int i, j;
-
-	for (i = nrmin; i <= nrmax; i++) {
-		for (j = ncmin; j <= ncmax; j++) {
-			if (ivec_matrix[i][j].nelem != 0) {
-				free(ivec_matrix[i][j].list);
-			}
-		}
-	}
-
-    vtr::free_matrix(ivec_matrix, nrmin, nrmax, ncmin);
-}
-
-void free_ivec_matrix3(t_ivec ***ivec_matrix3, int nrmin, int nrmax,
-		int ncmin, int ncmax, int ndmin, int ndmax) {
-
-	/* Frees a 3D matrix of integer vectors (ivecs).                     */
-
-	int i, j, k;
-
-	for (i = nrmin; i <= nrmax; i++) {
-		for (j = ncmin; j <= ncmax; j++) {
-			for (k = ndmin; k <= ndmax; k++) {
-				if (ivec_matrix3[i][j][k].nelem != 0) {
-					free(ivec_matrix3[i][j][k].list);
-				}
-			}
-		}
-	}
-
-    vtr::free_matrix3(ivec_matrix3, nrmin, nrmax, ncmin, ncmax, ndmin);
-}
-
-void print_int_matrix3(int ***vptr, int nrmin, int nrmax, int ncmin, int ncmax,
-		int ndmin, int ndmax, char *file) {
-	FILE *outfile;
-	int i, j, k;
-
-	outfile = vtr::fopen(file, "w");
-
-	for (k = nrmin; k <= nrmax; ++k) {
-		fprintf(outfile, "Plane %d\n", k);
-		for (j = ncmin; j <= ncmax; ++j) {
-			for (i = ndmin; i <= ndmax; ++i) {
-				fprintf(outfile, "%d ", vptr[k][j][i]);
-			}
-			fprintf(outfile, "\n");
-		}
-		fprintf(outfile, "\n");
-	}
-
-    vtr::fclose(outfile);
-}
-
-
 void alloc_ivector_and_copy_int_list(t_linked_int ** list_head_ptr,
 		int num_items, t_ivec *ivec, t_linked_int ** free_list_head_ptr) {
 

libvtrutil/src/vtr_matrix.h

@@ -4,142 +4,13 @@
 #include <cstdlib>
 
 #include "vtr_list.h"
-#include "vtr_memory.h"
-#include "vtr_assert.h"
 
 namespace vtr {
 
-    template<typename T>
-    T** alloc_matrix(int nrmin, int nrmax, int ncmin, int ncmax) {
-        /* allocates an generic matrix with nrmax-nrmin + 1 rows and ncmax - *
-         * ncmin + 1 columns, with each element of size elsize. i.e.         *
-         * returns a pointer to a storage block [nrmin..nrmax][ncmin..ncmax].*/
-
-        int i;
-        T** ptr;
-
-        int nrows = nrmax - nrmin + 1;
-        int ncols = ncmax - ncmin + 1;
-
-        VTR_ASSERT_MSG(nrows >= 0, "Allocated matrix must have zero-or-more rows");
-        VTR_ASSERT_MSG(ncols >= 0, "Allocated matrix must have zero-or-more columns");
-
-        ptr = (T**) vtr::malloc(nrows * sizeof(T*));
-        ptr -= nrmin;
-        for (i = nrmin; i <= nrmax; i++) {
-            ptr[i] = (T *) vtr::malloc(ncols * sizeof(T));
-            ptr[i] -= ncmin;
-        }
-        return ptr;
-    }
-
-    template<typename T>
-    T*** alloc_matrix3(int nrmin, int nrmax, int ncmin, int ncmax, int ndmin, int ndmax) {
-        /* allocates a 3D generic matrix with nrmax-nrmin + 1 rows, ncmax -  *
-         * ncmin + 1 columns, and a depth of ndmax-ndmin + 1, with each      *
-         * element of size elsize. i.e. returns a pointer to a storage block *
-         * [nrmin..nrmax][ncmin..ncmax][ndmin..ndmax].                       */
-
-        int i;
-        T*** ptr;
-
-        int nrows = nrmax - nrmin + 1;
-        VTR_ASSERT_MSG(nrows >= 0, "Allocated matrix must have zero-or-more rows");
-
-        ptr = (T***) vtr::malloc(nrows * sizeof(T**));
-        ptr -= nrmin;
-        for (i = nrmin; i <= nrmax; i++) {
-            ptr[i] = alloc_matrix<T>(ncmin, ncmax, ndmin, ndmax);
-        }
-        return ptr;
-    }
-
-    template<typename T>
-    T**** alloc_matrix4(int nrmin, int nrmax, int ncmin, int ncmax, int ndmin, int ndmax,
-            int nemin, int nemax) {
-
-        /* allocates a 4D generic matrix. Returns a pointer to a storage block *
-         * [nrmin..nrmax][ncmin..ncmax][ndmin..ndmax][nemin..nemax].           */
-        int i;
-        T ****ptr;
-
-        int nrows = nrmax - nrmin + 1;
-        VTR_ASSERT_MSG(nrows >= 0, "Allocated matrix must have zero-or-more rows");
-
-        ptr = (T ****) vtr::malloc(nrows * sizeof(T ***));
-        ptr -= nrmin;
-        for (i = nrmin; i <= nrmax; i++) {
-            ptr[i] = alloc_matrix3<T>(ncmin, ncmax, ndmin, ndmax, nemin, nemax);
-        }
-        return ptr;
-    }
-
-    template<typename T>
-    T***** alloc_matrix5(int nrmin, int nrmax, int ncmin, int ncmax, int ndmin, int ndmax,
-            int nemin, int nemax, int nfmin, int nfmax) {
-
-        /* allocates a 5D generic matrix. Returns a pointer to a storage block    *
-         * [nrmin..nrmax][ncmin..ncmax][ndmin..ndmax][nemin..nemax][nfmin..nfmax] */
-        int i;
-        T *****ptr;
-
-        int nrows = nrmax - nrmin + 1;
-        VTR_ASSERT_MSG(nrows >= 0, "Allocated matrix must have zero-or-more rows");
-
-        ptr = (T *****) vtr::malloc(nrows * sizeof(T ****));
-        ptr -= nrmin;
-        for (i = nrmin; i <= nrmax; i++) {
-            ptr[i] = alloc_matrix4<T>(ncmin, ncmax, ndmin, ndmax, nemin, nemax, nfmin, nfmax);
-        }
-        return ptr;
-    }
-
-    template<typename T>
-    void free_matrix(T* ptr, int nrmin, int nrmax, int ncmin) {
-        int i;
-        for (i = nrmin; i <= nrmax; i++) {
-            //coverity[offset_free]
-            std::free(ptr[i] + ncmin);
-        }
-        //coverity[offset_free]
-        std::free(ptr + nrmin);
-    }
-
-    template<typename T>
-    void free_matrix3(T** ptr, int nrmin, int nrmax, int ncmin, int ncmax, int ndmin) {
-        int i;
-        for (i = nrmin; i <= nrmax; i++) {
-            free_matrix(ptr[i], ncmin, ncmax, ndmin);
-        }
-        //coverity[offset_free]
-        std::free(ptr + nrmin);
-    }
-
-    template<typename T>
-    void free_matrix4(T**** ptr, int nrmin, int nrmax, int ncmin, int ncmax, int ndmin, int ndmax,
-            int nemin) {
-        int i;
-        for (i = nrmin; i <= nrmax; i++) {
-            free_matrix3(ptr[i], ncmin, ncmax, ndmin, ndmax, nemin);
-        }
-        //coverity[offset_free]
-        std::free(ptr + nrmin);
-    }
-
-    template<typename T>
-    void free_matrix5(T***** ptr, int nrmin, int nrmax, int ncmin, int ncmax, int ndmin, int ndmax,
-            int nemin, int nemax, int nfmin) {
-        int i;
-        for (i = nrmin; i <= nrmax; i++) {
-            free_matrix4(ptr[i], ncmin, ncmax, ndmin, ndmax, nemin, nemax, nfmin);
-        }
-        //coverity[offset_free]
-        std::free(ptr + nrmin);
-    }
-
     /* Integer vector.  nelem stores length, list[0..nelem-1] stores list of    *
      * integers.                                                                */
 
+    //TODO: Convert all uses of this data structure to std::vector and elete
     typedef struct s_ivec {
         int nelem;
         int *list;
@@ -148,14 +19,6 @@ namespace vtr {
     void alloc_ivector_and_copy_int_list(t_linked_int ** list_head_ptr,
             int num_items, t_ivec *ivec, t_linked_int ** free_list_head_ptr);
     void free_ivec_vector(t_ivec *ivec_vector, int nrmin, int nrmax);
-    void free_ivec_matrix(t_ivec **ivec_matrix, int nrmin, int nrmax,
-            int ncmin, int ncmax);
-    void free_ivec_matrix3(t_ivec ***ivec_matrix3, int nrmin,
-            int nrmax, int ncmin, int ncmax, int ndmin, int ndmax);
-
-    void print_int_matrix3(int ***vptr, int nrmin, int nrmax, int ncmin,
-            int ncmax, int ndmin, int ndmax, char *file);
-
 
 } //namespace