summaryrefslogtreecommitdiff
path: root/SpMV/support
diff options
context:
space:
mode:
Diffstat (limited to 'SpMV/support')
-rw-r--r--SpMV/support/common.h17
-rw-r--r--SpMV/support/matrix.h199
-rw-r--r--SpMV/support/params.h67
-rw-r--r--SpMV/support/timer.h23
-rw-r--r--SpMV/support/utils.h1
5 files changed, 166 insertions, 141 deletions
diff --git a/SpMV/support/common.h b/SpMV/support/common.h
index 58fede8..6118814 100644
--- a/SpMV/support/common.h
+++ b/SpMV/support/common.h
@@ -8,18 +8,17 @@
#define ROUND_UP_TO_MULTIPLE_OF_8(x) ((((x) + 7)/8)*8)
struct DPUParams {
- uint32_t dpuNumRows; /* Number of rows assigned to the DPU */
- uint32_t dpuRowPtrsOffset; /* Offset of the row pointers */
- uint32_t dpuRowPtrs_m;
- uint32_t dpuNonzeros_m;
- uint32_t dpuInVector_m;
- uint32_t dpuOutVector_m;
+ uint32_t dpuNumRows; /* Number of rows assigned to the DPU */
+ uint32_t dpuRowPtrsOffset; /* Offset of the row pointers */
+ uint32_t dpuRowPtrs_m;
+ uint32_t dpuNonzeros_m;
+ uint32_t dpuInVector_m;
+ uint32_t dpuOutVector_m;
};
struct Nonzero {
- uint32_t col;
- float value;
+ uint32_t col;
+ float value;
};
#endif
-
diff --git a/SpMV/support/matrix.h b/SpMV/support/matrix.h
index d25da1b..ce8745e 100644
--- a/SpMV/support/matrix.h
+++ b/SpMV/support/matrix.h
@@ -9,111 +9,130 @@
#include "utils.h"
struct COOMatrix {
- uint32_t numRows;
- uint32_t numCols;
- uint32_t numNonzeros;
- uint32_t* rowIdxs;
- struct Nonzero* nonzeros;
+ uint32_t numRows;
+ uint32_t numCols;
+ uint32_t numNonzeros;
+ uint32_t *rowIdxs;
+ struct Nonzero *nonzeros;
};
struct CSRMatrix {
- uint32_t numRows;
- uint32_t numCols;
- uint32_t numNonzeros;
- uint32_t* rowPtrs;
- struct Nonzero* nonzeros;
+ uint32_t numRows;
+ uint32_t numCols;
+ uint32_t numNonzeros;
+ uint32_t *rowPtrs;
+ struct Nonzero *nonzeros;
};
-static struct COOMatrix readCOOMatrix(const char* fileName) {
-
- struct COOMatrix cooMatrix;
-
- // Initialize fields
- FILE* fp = fopen(fileName, "r");
- assert(fscanf(fp, "%u", &cooMatrix.numRows));
- if(cooMatrix.numRows%2 == 1) {
- PRINT_WARNING("Reading matrix %s: number of rows must be even. Padding with an extra row.", fileName);
- cooMatrix.numRows++;
- }
- assert(fscanf(fp, "%u", &cooMatrix.numCols));
- assert(fscanf(fp, "%u", &cooMatrix.numNonzeros));
- cooMatrix.rowIdxs = (uint32_t*) malloc(ROUND_UP_TO_MULTIPLE_OF_8(cooMatrix.numNonzeros*sizeof(uint32_t)));
- cooMatrix.nonzeros = (struct Nonzero*) malloc(ROUND_UP_TO_MULTIPLE_OF_8(cooMatrix.numNonzeros*sizeof(struct Nonzero)));
-
- // Read the nonzeros
- for(uint32_t i = 0; i < cooMatrix.numNonzeros; ++i) {
- uint32_t rowIdx;
- assert(fscanf(fp, "%u", &rowIdx));
- cooMatrix.rowIdxs[i] = rowIdx - 1; // File format indexes begin at 1
- uint32_t colIdx;
- assert(fscanf(fp, "%u", &colIdx));
- cooMatrix.nonzeros[i].col = colIdx - 1; // File format indexes begin at 1
- cooMatrix.nonzeros[i].value = 1.0f;
- }
-
- return cooMatrix;
+static struct COOMatrix readCOOMatrix(const char *fileName)
+{
+
+ struct COOMatrix cooMatrix;
+
+ // Initialize fields
+ FILE *fp = fopen(fileName, "r");
+ assert(fscanf(fp, "%u", &cooMatrix.numRows));
+ if (cooMatrix.numRows % 2 == 1) {
+ PRINT_WARNING
+ ("Reading matrix %s: number of rows must be even. Padding with an extra row.",
+ fileName);
+ cooMatrix.numRows++;
+ }
+ assert(fscanf(fp, "%u", &cooMatrix.numCols));
+ assert(fscanf(fp, "%u", &cooMatrix.numNonzeros));
+ cooMatrix.rowIdxs =
+ (uint32_t *)
+ malloc(ROUND_UP_TO_MULTIPLE_OF_8
+ (cooMatrix.numNonzeros * sizeof(uint32_t)));
+ cooMatrix.nonzeros =
+ (struct Nonzero *)
+ malloc(ROUND_UP_TO_MULTIPLE_OF_8
+ (cooMatrix.numNonzeros * sizeof(struct Nonzero)));
+
+ // Read the nonzeros
+ for (uint32_t i = 0; i < cooMatrix.numNonzeros; ++i) {
+ uint32_t rowIdx;
+ assert(fscanf(fp, "%u", &rowIdx));
+ cooMatrix.rowIdxs[i] = rowIdx - 1; // File format indexes begin at 1
+ uint32_t colIdx;
+ assert(fscanf(fp, "%u", &colIdx));
+ cooMatrix.nonzeros[i].col = colIdx - 1; // File format indexes begin at 1
+ cooMatrix.nonzeros[i].value = 1.0f;
+ }
+
+ return cooMatrix;
}
-static void freeCOOMatrix(struct COOMatrix cooMatrix) {
- free(cooMatrix.rowIdxs);
- free(cooMatrix.nonzeros);
+static void freeCOOMatrix(struct COOMatrix cooMatrix)
+{
+ free(cooMatrix.rowIdxs);
+ free(cooMatrix.nonzeros);
}
-static struct CSRMatrix coo2csr(struct COOMatrix cooMatrix) {
-
- struct CSRMatrix csrMatrix;
-
- // Initialize fields
- csrMatrix.numRows = cooMatrix.numRows;
- csrMatrix.numCols = cooMatrix.numCols;
- csrMatrix.numNonzeros = cooMatrix.numNonzeros;
- csrMatrix.rowPtrs = (uint32_t*) malloc(ROUND_UP_TO_MULTIPLE_OF_8((csrMatrix.numRows + 1)*sizeof(uint32_t)));
- csrMatrix.nonzeros = (struct Nonzero*) malloc(ROUND_UP_TO_MULTIPLE_OF_8(csrMatrix.numNonzeros*sizeof(struct Nonzero)));
-
- // Histogram rowIdxs
- memset(csrMatrix.rowPtrs, 0, (csrMatrix.numRows + 1)*sizeof(uint32_t));
- for(uint32_t i = 0; i < cooMatrix.numNonzeros; ++i) {
- uint32_t rowIdx = cooMatrix.rowIdxs[i];
- csrMatrix.rowPtrs[rowIdx]++;
- }
-
- // Prefix sum rowPtrs
- uint32_t sumBeforeNextRow = 0;
- for(uint32_t rowIdx = 0; rowIdx < csrMatrix.numRows; ++rowIdx) {
- uint32_t sumBeforeRow = sumBeforeNextRow;
- sumBeforeNextRow += csrMatrix.rowPtrs[rowIdx];
- csrMatrix.rowPtrs[rowIdx] = sumBeforeRow;
- }
- csrMatrix.rowPtrs[csrMatrix.numRows] = sumBeforeNextRow;
-
- // Bin the nonzeros
- for(uint32_t i = 0; i < cooMatrix.numNonzeros; ++i) {
- uint32_t rowIdx = cooMatrix.rowIdxs[i];
- uint32_t nnzIdx = csrMatrix.rowPtrs[rowIdx]++;
- csrMatrix.nonzeros[nnzIdx] = cooMatrix.nonzeros[i];
- }
-
- // Restore rowPtrs
- for(uint32_t rowIdx = csrMatrix.numRows - 1; rowIdx > 0; --rowIdx) {
- csrMatrix.rowPtrs[rowIdx] = csrMatrix.rowPtrs[rowIdx - 1];
- }
- csrMatrix.rowPtrs[0] = 0;
-
- return csrMatrix;
+static struct CSRMatrix coo2csr(struct COOMatrix cooMatrix)
+{
+
+ struct CSRMatrix csrMatrix;
+
+ // Initialize fields
+ csrMatrix.numRows = cooMatrix.numRows;
+ csrMatrix.numCols = cooMatrix.numCols;
+ csrMatrix.numNonzeros = cooMatrix.numNonzeros;
+ csrMatrix.rowPtrs =
+ (uint32_t *)
+ malloc(ROUND_UP_TO_MULTIPLE_OF_8
+ ((csrMatrix.numRows + 1) * sizeof(uint32_t)));
+ csrMatrix.nonzeros =
+ (struct Nonzero *)
+ malloc(ROUND_UP_TO_MULTIPLE_OF_8
+ (csrMatrix.numNonzeros * sizeof(struct Nonzero)));
+
+ // Histogram rowIdxs
+ memset(csrMatrix.rowPtrs, 0,
+ (csrMatrix.numRows + 1) * sizeof(uint32_t));
+ for (uint32_t i = 0; i < cooMatrix.numNonzeros; ++i) {
+ uint32_t rowIdx = cooMatrix.rowIdxs[i];
+ csrMatrix.rowPtrs[rowIdx]++;
+ }
+
+ // Prefix sum rowPtrs
+ uint32_t sumBeforeNextRow = 0;
+ for (uint32_t rowIdx = 0; rowIdx < csrMatrix.numRows; ++rowIdx) {
+ uint32_t sumBeforeRow = sumBeforeNextRow;
+ sumBeforeNextRow += csrMatrix.rowPtrs[rowIdx];
+ csrMatrix.rowPtrs[rowIdx] = sumBeforeRow;
+ }
+ csrMatrix.rowPtrs[csrMatrix.numRows] = sumBeforeNextRow;
+
+ // Bin the nonzeros
+ for (uint32_t i = 0; i < cooMatrix.numNonzeros; ++i) {
+ uint32_t rowIdx = cooMatrix.rowIdxs[i];
+ uint32_t nnzIdx = csrMatrix.rowPtrs[rowIdx]++;
+ csrMatrix.nonzeros[nnzIdx] = cooMatrix.nonzeros[i];
+ }
+
+ // Restore rowPtrs
+ for (uint32_t rowIdx = csrMatrix.numRows - 1; rowIdx > 0; --rowIdx) {
+ csrMatrix.rowPtrs[rowIdx] = csrMatrix.rowPtrs[rowIdx - 1];
+ }
+ csrMatrix.rowPtrs[0] = 0;
+
+ return csrMatrix;
}
-static void freeCSRMatrix(struct CSRMatrix csrMatrix) {
- free(csrMatrix.rowPtrs);
- free(csrMatrix.nonzeros);
+static void freeCSRMatrix(struct CSRMatrix csrMatrix)
+{
+ free(csrMatrix.rowPtrs);
+ free(csrMatrix.nonzeros);
}
-static void initVector(float* vec, uint32_t size) {
- for(uint32_t i = 0; i < size; ++i) {
- vec[i] = 1.0f;
- }
+static void initVector(float *vec, uint32_t size)
+{
+ for (uint32_t i = 0; i < size; ++i) {
+ vec[i] = 1.0f;
+ }
}
#endif
-
diff --git a/SpMV/support/params.h b/SpMV/support/params.h
index b4b696c..bf60e79 100644
--- a/SpMV/support/params.h
+++ b/SpMV/support/params.h
@@ -5,42 +5,47 @@
#include "common.h"
#include "utils.h"
-static void usage() {
- PRINT( "\nUsage: ./program [options]"
- "\n"
- "\nBenchmark-specific options:"
- "\n -f <F> input matrix file name (default=data/bcsstk30.mtx)"
- "\n"
- "\nGeneral options:"
- "\n -v <V> verbosity"
- "\n -h help"
- "\n\n");
+static void usage()
+{
+ PRINT("\nUsage: ./program [options]"
+ "\n"
+ "\nBenchmark-specific options:"
+ "\n -f <F> input matrix file name (default=data/bcsstk30.mtx)"
+ "\n"
+ "\nGeneral options:"
+ "\n -v <V> verbosity" "\n -h help" "\n\n");
}
typedef struct Params {
- const char* fileName;
- unsigned int verbosity;
+ const char *fileName;
+ unsigned int verbosity;
} Params;
-static struct Params input_params(int argc, char **argv) {
- struct Params p;
- p.fileName = "data/bcsstk30.mtx";
- p.verbosity = 1;
- int opt;
- while((opt = getopt(argc, argv, "f:v:h")) >= 0) {
- switch(opt) {
- case 'f': p.fileName = optarg; break;
- case 'v': p.verbosity = atoi(optarg); break;
- case 'h': usage(); exit(0);
- default:
- PRINT_ERROR("Unrecognized option!");
- usage();
- exit(0);
- }
- }
-
- return p;
+static struct Params input_params(int argc, char **argv)
+{
+ struct Params p;
+ p.fileName = "data/bcsstk30.mtx";
+ p.verbosity = 1;
+ int opt;
+ while ((opt = getopt(argc, argv, "f:v:h")) >= 0) {
+ switch (opt) {
+ case 'f':
+ p.fileName = optarg;
+ break;
+ case 'v':
+ p.verbosity = atoi(optarg);
+ break;
+ case 'h':
+ usage();
+ exit(0);
+ default:
+ PRINT_ERROR("Unrecognized option!");
+ usage();
+ exit(0);
+ }
+ }
+
+ return p;
}
#endif
-
diff --git a/SpMV/support/timer.h b/SpMV/support/timer.h
index 66e9842..7367b11 100644
--- a/SpMV/support/timer.h
+++ b/SpMV/support/timer.h
@@ -6,22 +6,25 @@
#include <sys/time.h>
typedef struct Timer {
- struct timeval startTime;
- struct timeval endTime;
+ struct timeval startTime;
+ struct timeval endTime;
} Timer;
-static void startTimer(Timer* timer) {
- gettimeofday(&(timer->startTime), NULL);
+static void startTimer(Timer *timer)
+{
+ gettimeofday(&(timer->startTime), NULL);
}
-static void stopTimer(Timer* timer) {
- gettimeofday(&(timer->endTime), NULL);
+static void stopTimer(Timer *timer)
+{
+ gettimeofday(&(timer->endTime), NULL);
}
-static double getElapsedTime(Timer timer) {
- return ((double) ((timer.endTime.tv_sec - timer.startTime.tv_sec)
- + (timer.endTime.tv_usec - timer.startTime.tv_usec)/1.0e6));
+static double getElapsedTime(Timer timer)
+{
+ return ((double)((timer.endTime.tv_sec - timer.startTime.tv_sec)
+ + (timer.endTime.tv_usec -
+ timer.startTime.tv_usec) / 1.0e6));
}
#endif
-
diff --git a/SpMV/support/utils.h b/SpMV/support/utils.h
index ddb1e2c..ccd8fbd 100644
--- a/SpMV/support/utils.h
+++ b/SpMV/support/utils.h
@@ -8,4 +8,3 @@
#define PRINT(fmt, ...) printf(fmt "\n", ##__VA_ARGS__)
#endif
-
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-23 22:46:27 +0000