Modified integer version of mp, from int32 to int64

Author: audictheprogrammer

src/data/Matrix_A.txt

@@ -518,6 +518,9 @@ int main(){
     // clean_file_blocks_MP();
     // benchmark_blocks_MP(p, u_overline);
 
+    // clean_file_float_integer();
+    // benchmark_float_integer(p, u_overline, u_b);
+
 
     return 0;
 }

src/data/Matrix_B.txt

@@ -455,20 +455,19 @@ int main(int argc, char** argv){
         fesetround(FE_TONEAREST);
         u_int32_t u_b = (int) (pow(2, 54) / p);  // Constant for Barrett
 
-        int n = 512;
+        int n = 128;
         int bitsize_p = get_bitsize(p);
         int b = get_blocksize(bitsize_p, n);
 
         double* A = random_matrix_1D(n, p);
         double* B = random_matrix_1D(n, p);
-        u_int32_t* A_int = convert_float_to_integer(A, n);
-        u_int32_t* B_temp = convert_float_to_integer(B, n);
-        u_int32_t* B_int = transpose_matrix_integer(B_temp, n);
 
+        u_int64_t* A_int = convert_float_to_integer(A, n);
+        u_int64_t* B_temp = convert_float_to_integer(B, n);
+        u_int64_t* B_int = transpose_matrix_integer(B_temp, n);
 
         double* C = zero_matrix_1D(n);
-        u_int32_t* D = zero_matrix_1D_integer(n);
-        // u_int32_t* D = zero_matrix_1D_integer(n);
+        u_int64_t* D = zero_matrix_1D_integer(n);
 
         // PRODUCT STARTS **********************************
         mp_naive(A, B, C, n, p);

src/data/Matrix_C.txt

@@ -38,8 +38,8 @@ double* zero_matrix_1D(int n){
     return mat;
 }
 
-u_int32_t* zero_matrix_1D_integer(int n){
-    u_int32_t* mat = (u_int32_t*) malloc(sizeof(u_int32_t) * n*n);
+u_int64_t* zero_matrix_1D_integer(int n){
+    u_int64_t* mat = (u_int64_t*) malloc(sizeof(u_int64_t) * n*n);
     if (mat == NULL){
         printf("Malloc error !\n");
         return NULL;
@@ -108,6 +108,7 @@ double** convert_1D_to_2D(double* A, int n){
     return mat;
 }
 
+
 double* convert_2D_to_1D(double** A, int n){
     /* Converts a 2 dimensional square matrix to
     a 1 dimensional matrix. */
@@ -123,11 +124,10 @@ double* convert_2D_to_1D(double** A, int n){
 }
 
 
-
-u_int32_t* convert_float_to_integer(double* A, int n){
+u_int64_t* convert_float_to_integer(double* A, int n){
     /* Converts the coeffients of a double matrix to u_int32_t matrix.
     */
-    u_int32_t* mat = zero_matrix_1D_integer(n);
+    u_int64_t* mat = zero_matrix_1D_integer(n);
     for (int i=0; i<n*n; i++){
         mat[i] = (int) A[i];
     }
@@ -158,7 +158,7 @@ void delete_matrix_1D(double** mat, int n){
     *mat = NULL;
 }
 
-void delete_matrix_1D_integer(u_int32_t** mat, int n){
+void delete_matrix_1D_integer(u_int64_t** mat, int n){
     /* Delete the 1D matrix and set it to NULL*/
     if (*mat == NULL){
         printf("Matrix is NULL cannot delete !\n");
@@ -169,24 +169,9 @@ void delete_matrix_1D_integer(u_int32_t** mat, int n){
 }
 
 
-
-double** transpose_matrix(double** mat, int n){
-    /* Tranpose a matrix */
-    double** mat_t = zero_matrix_2D(n);
-    if (mat_t == NULL){
-        printf("Cannot transpose the matrix !\n");
-    }
-    for (int i = 0; i < n; i++){
-        for (int j = 0; j < n; j++){
-            mat_t[i][j] = mat[j][i];
-        }
-    }
-    return mat_t;
-}
-
-u_int32_t* transpose_matrix_integer(u_int32_t* mat, int n){
+u_int64_t* transpose_matrix_integer(u_int64_t* mat, int n){
     /* Transpose a matrix */
-    u_int32_t* mat_t = zero_matrix_1D_integer(n);
+    u_int64_t* mat_t = zero_matrix_1D_integer(n);
     if (mat_t == NULL){
         printf("Cannot transpose the matrix !\n");
     }
@@ -198,6 +183,7 @@ u_int32_t* transpose_matrix_integer(u_int32_t* mat, int n){
     return mat_t;
 }
 
+
 void print_matrix_2D(double** mat, int n){
     /* Print the matrix. Here is an example:
     [ 1 2 3 ]
@@ -241,7 +227,8 @@ void print_matrix_1D(double* mat, int n){
     return ;
 }
 
-void print_matrix_1D_integer(u_int32_t* mat, int n){
+
+void print_matrix_1D_integer(u_int64_t* mat, int n){
     /* Print the matrix. Here is an example:
     [ 1 2 3 ]
     [ 4 5 6 ]
@@ -255,7 +242,7 @@ void print_matrix_1D_integer(u_int32_t* mat, int n){
         if (i % n == 0){
             printf("[ ");
         }
-        printf("%d ", mat[i]);
+        printf("%ld ", mat[i]);
         if ((i+1) % n == 0){
             printf("]\n");
         }
@@ -264,9 +251,6 @@ void print_matrix_1D_integer(u_int32_t* mat, int n){
 }
 
 
-
-
-
 void write_matrix(double** mat, int n, char* filename){
     /* Write the matrix into a file. Here is an example:
     2
@@ -292,6 +276,7 @@ void write_matrix(double** mat, int n, char* filename){
     return;
 }
 
+
 void write_matrix_1D(double* mat, int n, char* filename){
     /* Write the matrix into a file. Here is an example:
     2
@@ -304,7 +289,8 @@ void write_matrix_1D(double* mat, int n, char* filename){
     return;
 }
 
-void write_matrix_1D_integer(u_int32_t* mat, int n, char* filename){
+
+void write_matrix_1D_integer(u_int64_t* mat, int n, char* filename){
     /* Write the matrix into a file. Here is an example:
     2
     [ 1 2 ]
@@ -320,7 +306,7 @@ void write_matrix_1D_integer(u_int32_t* mat, int n, char* filename){
     for (int i = 0; i < n; i++){
             fprintf(f, "[ ");
         for(int j = 0; j < n; j++){
-            fprintf(f, "%d ", mat[i*n + j]);
+            fprintf(f, "%ld ", mat[i*n + j]);
         }
         fprintf(f, "]\n");
     }
@@ -329,6 +315,7 @@ void write_matrix_1D_integer(u_int32_t* mat, int n, char* filename){
     return;
 }
 
+
 double** read_matrix(char* filename, int* n){
     /* Read the file, update n, then return the matrix. */
     char buffer[1024];
@@ -371,6 +358,7 @@ double** read_matrix(char* filename, int* n){
     return mat;
 }
 
+
 double* read_matrix_1D(char* filename, int* n){
     double** mat = read_matrix(filename, n);
     if (mat == NULL)
@@ -433,26 +421,26 @@ int equals_matrix_1D_1D(double* A, double* B, int n){
     return 1;
 }
 
-int equals_matrix_float_integer(double* A, u_int32_t* B, int n){
+int equals_matrix_float_integer(double* A, u_int64_t* B, int n){
     /* Check if A equals B. The return values are:
     0: different
     1: equals
     */
     for (int i=0; i<n*n; i++){
         if (A[i] != B[i]){
             printf("A[%d] = %f \n", i, A[i]);
-            printf("B[%d] = %d \n", i, B[i]);
+            printf("B[%d] = %ld \n", i, B[i]);
             return 0;
         }
     }
     return 1;
 }
 
-int equals_matrix_integer_integer(u_int32_t* A, u_int32_t* B, int n){
+int equals_matrix_integer_integer(u_int64_t* A, u_int64_t* B, int n){
     for (int i=0; i<n*n; i++){
         if (A[i] != B[i]){
-            printf("A[%d] = %d \n", i, A[i]);
-            printf("B[%d] = %d \n", i, B[i]);
+            printf("A[%d] = %ld \n", i, A[i]);
+            printf("B[%d] = %ld \n", i, B[i]);
             return 0;
         }
     }

src/data/Matrix_D.txt

@@ -9,37 +9,37 @@
 // Basic operations
 double** zero_matrix_2D(int n);
 double* zero_matrix_1D(int n);
-u_int32_t* zero_matrix_1D_integer(int n);
+u_int64_t* zero_matrix_1D_integer(int n);
 
 double** random_matrix_2D(int n, double p);
 double* random_matrix_1D(int n, double p);
 
 double* convert_2D_to_1D(double** mat, int n);
 double** convert_1D_to_2D(double* mat, int n);
-u_int32_t* convert_float_to_integer(double* mat, int n);
+u_int64_t* convert_float_to_integer(double* mat, int n);
 
 void delete_matrix_2D(double*** mat, int n);
 void delete_matrix_1D(double** mat, int n);
-void delete_matrix_1D_integer(u_int32_t** mat, int n);
+void delete_matrix_1D_integer(u_int64_t** mat, int n);
 
-double** transpose_matrix(double** mat, int n);
-u_int32_t* transpose_matrix_integer(u_int32_t* mat, int n);
+u_int64_t* transpose_matrix_integer(u_int64_t* mat, int n);
 
 void print_matrix_2D(double** mat, int n);
 void print_matrix_1D(double* mat, int n);
-void print_matrix_1D_integer(u_int32_t* mat, int n);
+void print_matrix_1D_integer(u_int64_t* mat, int n);
 
 void write_matrix(double** mat, int n, char* filename);
 void write_matrix_1D(double* mat, int n, char* filename);
-void write_matrix_1D_integer(u_int32_t* mat, int n, char* filename);
+void write_matrix_1D_integer(u_int64_t* mat, int n, char* filename);
+
 double** read_matrix(char* filename, int* n);
 double* read_matrix_1D(char* filename, int* n);
 
 int equals_matrix_2D_2D(double** A, double** B, int n);
 int equals_matrix_2D_1D(double** A, double* B, int n);
 int equals_matrix_1D_1D(double* A, double* B, int n);
-int equals_matrix_float_integer(double* A, u_int32_t* B, int n);
-int equals_matrix_integer_integer(u_int32_t* A, u_int32_t* B, int n);
+int equals_matrix_float_integer(double* A, u_int64_t* B, int n);
+int equals_matrix_integer_integer(u_int64_t* A, u_int64_t* B, int n);
 
 int equals_matrix_file(char* filename1, char* filename2);
 

src/main.c

@@ -425,17 +425,18 @@ void mp_kji(double* A, double* B, double* C, int n){
     }
 }
 
-void mp_integer(u_int32_t* A, u_int32_t* B, u_int32_t* C, int n, u_int32_t p, u_int32_t u){
+
+void mp_integer(u_int64_t* A, u_int64_t* B, u_int64_t* C, int n, u_int32_t p, u_int32_t u){
     /* Matrix product using: Decomp Barrett and Trans */
 
     for (int i = 0; i < n; i++){
         for (int j = 0; j < n; j++){
             u_int64_t h = 0;
             u_int64_t l = 0;
             for (int k = 0; k < n; k++){
-                u_int64_t temp = (u_int64_t) A[i*n + k] * B[j*n + k];
-                h += temp >> 32;
-                l += temp - ((temp >> 32) << 32);
+                u_int64_t temp = A[i*n + k] * B[j*n + k];
+                h = h + (temp >> 32);
+                l += temp - (((temp) >> 32) << 32);
             }
 
             u_int64_t t = 1;

src/main_test.c

@@ -43,6 +43,6 @@ void mp_ikj(double* A, double* B, double* C, int n);
 void mp_jik(double* A, double* B, double* C, int n);
 void mp_kji(double* A, double* B, double* C, int n);
 
-void mp_integer(u_int32_t* A, u_int32_t* B, u_int32_t* C, int n, u_int32_t p, u_int32_t u);
-void mp_integer_naive(u_int32_t* A, u_int32_t* B, u_int32_t* C, int n, u_int32_t p, u_int32_t u);
+void mp_integer(u_int64_t* A, u_int64_t* B, u_int64_t* C, int n, u_int32_t p, u_int32_t u);
+
 #endif