projects
/
cse-arch-proj1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
429638e
)
retab for gitweb
master
author
kremlin
<ian@kremlin.cc>
Sat, 18 Oct 2014 01:02:12 +0000
(21:02 -0400)
committer
kremlin
<ian@kremlin.cc>
Sat, 18 Oct 2014 01:02:12 +0000
(21:02 -0400)
src/proto.c
patch
|
blob
|
blame
|
history
diff --git
a/src/proto.c
b/src/proto.c
index f4a25445e98fd6ea374594ed923497ffb71921e5..2129f9200ec7b5d6954c053cb211089b8b629ea5 100644
(file)
--- a/
src/proto.c
+++ b/
src/proto.c
@@
-26,162
+26,162
@@
int main(int argc, char *argv[]) {
int main(int argc, char *argv[]) {
-
#ifdef HARDCODED_OPERANDS
+ #ifdef HARDCODED_OPERANDS
-
/* volatile, otherwise GCC optimizations muddy things up. 'a' and
+ /* volatile, otherwise GCC optimizations muddy things up. 'a' and
* 'b' are our starting matricies */
* 'b' are our starting matricies */
-
volatile int a[MS][MS] = {
-
{ 1, 2, 3},
-
{ 4, 5, 6},
-
{ 7, 8, 9}
-
};
+ volatile int a[MS][MS] = {
+ { 1, 2, 3},
+ { 4, 5, 6},
+ { 7, 8, 9}
+ };
-
volatile int b[MS][MS] = {
-
{ 1, 4, 7},
-
{ 2, 5, 8},
-
{ 3, 6, 9}
-
};
-
#endif
+ volatile int b[MS][MS] = {
+ { 1, 4, 7},
+ { 2, 5, 8},
+ { 3, 6, 9}
+ };
+ #endif
-
/* 'd' and 'c' are matricies that store the result of the
-
* combinations of 'a' and 'b' prior to multiplication */
-
volatile int c[MS][MS], d[MS][MS];
+ /* 'd' and 'c' are matricies that store the result of the
+ * combinations of 'a' and 'b' prior to multiplication */
+ volatile int c[MS][MS], d[MS][MS];
-
/* where our resultant matrix is stored */
-
volatile int result[MS][MS];
+ /* where our resultant matrix is stored */
+ volatile int result[MS][MS];
-
/* zero-out our result buffers */
-
matrix_init0(c);
-
matrix_init0(d);
-
matrix_init0(result);
+ /* zero-out our result buffers */
+ matrix_init0(c);
+ matrix_init0(d);
+ matrix_init0(result);
-
/* first we combine A + B and store it in C */
-
matrix_add(a, b, c);
+ /* first we combine A + B and store it in C */
+ matrix_add(a, b, c);
-
/* then we subtract A - B and store it in D */
-
matrix_sub(a, b, d);
+ /* then we subtract A - B and store it in D */
+ matrix_sub(a, b, d);
-
/* finally, we multiply A * B and store it in result */
-
matrix_mult(a, b, result);
+ /* finally, we multiply A * B and store it in result */
+ matrix_mult(a, b, result);
-
#ifdef DEBUG
+ #ifdef DEBUG
-
printf("Matrix A:\n");
-
matrix_print(a);
+ printf("Matrix A:\n");
+ matrix_print(a);
-
printf("\nMatrix B:\n");
-
matrix_print(b);
+ printf("\nMatrix B:\n");
+ matrix_print(b);
-
printf("\nAdded Matrix (A + B) -> C:\n");
-
matrix_print(c);
+ printf("\nAdded Matrix (A + B) -> C:\n");
+ matrix_print(c);
-
printf("\nSubtracted Matrix (A - B) -> D:\n");
-
matrix_print(d);
+ printf("\nSubtracted Matrix (A - B) -> D:\n");
+ matrix_print(d);
-
printf("\nMultiplied Matrix (C * D) -> Result:\n");
-
matrix_print(result);
+ printf("\nMultiplied Matrix (C * D) -> Result:\n");
+ matrix_print(result);
-
#endif
+ #endif
-
return 0;
+ return 0;
}
static void matrix_add(volatile int op1[MS][MS], volatile int op2[MS][MS], volatile int result_buf[MS][MS]) {
}
static void matrix_add(volatile int op1[MS][MS], volatile int op2[MS][MS], volatile int result_buf[MS][MS]) {
-
int i, j;
+ int i, j;
-
i = 0;
-
j = 0;
+ i = 0;
+ j = 0;
-
for(; i < MS; i++) {
+ for(; i < MS; i++) {
-
j = 0;
+ j = 0;
-
for(; j < MS; j++)
-
result_buf[i][j] = op1[i][j] + op2[i][j];
-
}
+ for(; j < MS; j++)
+ result_buf[i][j] = op1[i][j] + op2[i][j];
+ }
}
static void matrix_sub(volatile int op1[MS][MS], volatile int op2[MS][MS], volatile int result_buf[MS][MS]) {
}
static void matrix_sub(volatile int op1[MS][MS], volatile int op2[MS][MS], volatile int result_buf[MS][MS]) {
-
int i, j;
+ int i, j;
-
i = 0;
-
j = 0;
+ i = 0;
+ j = 0;
-
for(; i < MS; i++) {
+ for(; i < MS; i++) {
-
j = 0;
+ j = 0;
-
for(; j < MS; j++)
-
result_buf[i][j] = op1[i][j] - op2[i][j];
-
}
+ for(; j < MS; j++)
+ result_buf[i][j] = op1[i][j] - op2[i][j];
+ }
}
static void matrix_mult(volatile int op1[MS][MS], volatile int op2[MS][MS], volatile int result_buf[MS][MS]) {
}
static void matrix_mult(volatile int op1[MS][MS], volatile int op2[MS][MS], volatile int result_buf[MS][MS]) {
-
-
int i, j, k;
+
+ int i, j, k;
-
i = 0;
-
j = 0;
-
k = 0;
+ i = 0;
+ j = 0;
+ k = 0;
-
for(; i < MS; i++) {
+ for(; i < MS; i++) {
-
j = 0;
+ j = 0;
-
for(; j < MS; j++) {
+ for(; j < MS; j++) {
-
k = 0;
+ k = 0;
-
for(; k < MS; k++)
-
result_buf[i][j] += op1[i][k] * op2[k][j];
-
}
-
}
+ for(; k < MS; k++)
+ result_buf[i][j] += op1[i][k] * op2[k][j];
+ }
+ }
}
static void matrix_init0(volatile int matrix[MS][MS]) {
}
static void matrix_init0(volatile int matrix[MS][MS]) {
-
int i, j;
+ int i, j;
-
i = 0;
-
j = 0;
+ i = 0;
+ j = 0;
-
for(; i < MS; i++) {
+ for(; i < MS; i++) {
-
j = 0;
+ j = 0;
-
for(; j < MS; j++)
-
matrix[i][j] = 0;
-
}
+ for(; j < MS; j++)
+ matrix[i][j] = 0;
+ }
}
#ifdef DEBUG
static void matrix_print(volatile int matrix[MS][MS]) {
}
#ifdef DEBUG
static void matrix_print(volatile int matrix[MS][MS]) {
-
int i,j;
+ int i,j;
-
i = 0;
-
j = 0;
+ i = 0;
+ j = 0;
-
printf("\t┌────────────┐\n");
+ printf("\t┌────────────┐\n");
-
for(; i < MS; i++) {
+ for(; i < MS; i++) {
-
printf("\t│");
-
j = 0;
+ printf("\t│");
+ j = 0;
-
for(; j < MS; j++) {
+ for(; j < MS; j++) {
-
printf("%3d", matrix[i][j]);
+ printf("%3d", matrix[i][j]);
-
if(j + 1 != MS)
-
printf(" ");
-
}
+ if(j + 1 != MS)
+ printf(" ");
+ }
-
printf(" │\n");
-
}
+ printf(" │\n");
+ }
-
printf("\t└────────────┘\n");
+ printf("\t└────────────┘\n");
}
#endif
}
#endif