titaniumtown/os161-assignments
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
Simon Gardling
2024-09-10 13:03:02 -04:00
parent 53c617d779
commit d66450e427
381 changed files with 28864 additions and 34170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
userland/testbin/matmult/matmult-orig.c
View File

@@ -48,41 +48,39 @@
#include <unistd.h>
#include <stdio.h>
#define Dim 360 /* sum total of the arrays doesn't fit in
* physical memory
*/
#define Dim \
360 /* sum total of the arrays doesn't fit in \
* physical memory \
*/
#define RIGHT 46397160 /* correct answer */
#define RIGHT 46397160 /* correct answer */
int A[Dim][Dim];
int B[Dim][Dim];
int C[Dim][Dim];
int
main(void)
{
int i, j, k, r;
int main(void) {
int i, j, k, r;
for (i = 0; i < Dim; i++) /* first initialize the matrices */
for (j = 0; j < Dim; j++) {
A[i][j] = i;
B[i][j] = j;
C[i][j] = 0;
}
for (i = 0; i < Dim; i++) /* then multiply them together */
for (j = 0; j < Dim; j++)
for (k = 0; k < Dim; k++)
C[i][j] += A[i][k] * B[k][j];
printf("matmult-orig finished.\n");
r = C[Dim-1][Dim-1];
printf("answer is: %d (should be %d)\n", r, RIGHT);
if (r != RIGHT) {
printf("FAILED\n");
for (i = 0; i < Dim; i++) /* first initialize the matrices */
for (j = 0; j < Dim; j++) {
A[i][j] = i;
B[i][j] = j;
C[i][j] = 0;
}
else {
printf("Passed.\n");
}
return 0;
for (i = 0; i < Dim; i++) /* then multiply them together */
for (j = 0; j < Dim; j++)
for (k = 0; k < Dim; k++)
C[i][j] += A[i][k] * B[k][j];
printf("matmult-orig finished.\n");
r = C[Dim - 1][Dim - 1];
printf("answer is: %d (should be %d)\n", r, RIGHT);
if (r != RIGHT) {
printf("FAILED\n");
} else {
printf("Passed.\n");
}
return 0;
}

71
userland/testbin/matmult/matmult.c
View File

@@ -42,49 +42,48 @@
#include <unistd.h>
#include <stdio.h>
#define Dim 72 /* sum total of the arrays doesn't fit in
* physical memory
*/
#define Dim \
72 /* sum total of the arrays doesn't fit in \
* physical memory \
*/
#define RIGHT 8772192 /* correct answer */
#define RIGHT 8772192 /* correct answer */
int A[Dim][Dim];
int B[Dim][Dim];
int C[Dim][Dim];
int T[Dim][Dim][Dim];
int
main(void)
{
int i, j, k, r;
int main(void) {
int i, j, k, r;
for (i = 0; i < Dim; i++) /* first initialize the matrices */
for (j = 0; j < Dim; j++) {
A[i][j] = i;
B[i][j] = j;
C[i][j] = 0;
}
for (i = 0; i < Dim; i++) /* then multiply them together */
for (j = 0; j < Dim; j++)
for (k = 0; k < Dim; k++)
T[i][j][k] = A[i][k] * B[k][j];
for (i = 0; i < Dim; i++)
for (j = 0; j < Dim; j++)
for (k = 0; k < Dim; k++)
C[i][j] += T[i][j][k];
r = 0;
for (i = 0; i < Dim; i++)
r += C[i][i];
printf("matmult finished.\n");
printf("answer is: %d (should be %d)\n", r, RIGHT);
if (r != RIGHT) {
printf("FAILED\n");
return 1;
for (i = 0; i < Dim; i++) /* first initialize the matrices */
for (j = 0; j < Dim; j++) {
A[i][j] = i;
B[i][j] = j;
C[i][j] = 0;
}
printf("Passed.\n");
return 0;
for (i = 0; i < Dim; i++) /* then multiply them together */
for (j = 0; j < Dim; j++)
for (k = 0; k < Dim; k++)
T[i][j][k] = A[i][k] * B[k][j];
for (i = 0; i < Dim; i++)
for (j = 0; j < Dim; j++)
for (k = 0; k < Dim; k++)
C[i][j] += T[i][j][k];
r = 0;
for (i = 0; i < Dim; i++)
r += C[i][i];
printf("matmult finished.\n");
printf("answer is: %d (should be %d)\n", r, RIGHT);
if (r != RIGHT) {
printf("FAILED\n");
return 1;
}
printf("Passed.\n");
return 0;
}