unimore/hpc-2022-g3
unimore/hpc-2022-g3
1
Fork 0
mirror of https://github.com/Steffo99/unimore-hpc-assignments.git synced 2024-11-29 03:24:22 +00:00
Code Activity

Fix segfault for matrix A

Browse source
This commit is contained in:
Caterina Gazzotti 2022-11-29 08:23:24 -05:00
parent 7cffa2496e
commit 727ee0bff3
1 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
atax/atax.cu
View file

@ -27,17 +27,21 @@
*/ */
__host__ static void init_array(DATA_TYPE** A, DATA_TYPE* x) __host__ static void init_array(DATA_TYPE** A, DATA_TYPE* x)
{ {
for (int i = 0; i < NY; i++) { for (int i = 0; i < NY; i++)
{
x[i] = i * M_PI; x[i] = i * M_PI;
} }
for (int i = 0; i < NX; i++) { for (int i = 0; i < NX; i++)
for (int j = 0; j < NY; j++) { {
for (int j = 0; j < NY; j++)
{
A[i][j] = ((DATA_TYPE)i * (j + 1)) / NX; A[i][j] = ((DATA_TYPE)i * (j + 1)) / NX;
} }
} }
} }
/** /**
* Print the given array. * Print the given array.
* *
@ -45,9 +49,10 @@ __host__ static void init_array(DATA_TYPE** A, DATA_TYPE* x)
* *
* To be called on the CPU (uses the `__host__` qualifier). * To be called on the CPU (uses the `__host__` qualifier).
*/ */
__host__ static void print_array(int nx, DATA_TYPE* y) __host__ static void print_array(DATA_TYPE* y)
{ {
for (int i = 0; i < nx; i++) { for (int i = 0; i < NX; i++)
{
fprintf(stderr, DATA_PRINTF_MODIFIER, y[i]); fprintf(stderr, DATA_PRINTF_MODIFIER, y[i]);
} }
fprintf(stderr, "\n"); fprintf(stderr, "\n");
@ -63,23 +68,30 @@ __host__ static void print_array(int nx, DATA_TYPE* y)
*/ */
__host__ static void kernel_atax(DATA_TYPE** A, DATA_TYPE* x, DATA_TYPE* y) __host__ static void kernel_atax(DATA_TYPE** A, DATA_TYPE* x, DATA_TYPE* y)
{ {
for (int i = 0; i < NY; i++) { for (int i = 0; i < NY; i++)
{
y[i] = 0; y[i] = 0;
} }
for (int i = 0; i < NX; i++) { for (int i = 0; i < NX; i++)
{
DATA_TYPE tmp = 0; DATA_TYPE tmp = 0;
for (int j = 0; j < NY; j++) { for (int j = 0; j < NY; j++)
{
tmp += A[i][j] * x[j]; tmp += A[i][j] * x[j];
} }
for (int j = 0; j < NY; j++) { for (int j = 0; j < NY; j++)
{
y[j] = y[j] + A[i][j] * tmp; y[j] = y[j] + A[i][j] * tmp;
} }
} }
} }
/** /**
* The main function of the benchmark, which sets up tooling to measure the time spent computing `kernel_atax`. * The main function of the benchmark, which sets up tooling to measure the time spent computing `kernel_atax`.
* *
@ -88,14 +100,19 @@ __host__ static void kernel_atax(DATA_TYPE** A, DATA_TYPE* x, DATA_TYPE* y)
__host__ int main(int argc, char **argv) __host__ int main(int argc, char **argv)
{ {
POLYBENCH_2D_ARRAY_DECL(A, DATA_TYPE, NX, NY, nx, ny); DATA_TYPE **A = new DATA_TYPE*[NX];
POLYBENCH_1D_ARRAY_DECL(x, DATA_TYPE, NY, ny); DATA_TYPE x[NY], y[NX];
POLYBENCH_1D_ARRAY_DECL(y, DATA_TYPE, NX, nx);
for(size_t i=0; i<NX; i++)
{
A[i] = new DATA_TYPE[NY];
}
#ifdef POLYBENCH_INCLUDE_INIT #ifdef POLYBENCH_INCLUDE_INIT
polybench_start_instruments; polybench_start_instruments;
#endif #endif
init_array(A, x); init_array(A, x);
#ifndef POLYBENCH_INCLUDE_INIT #ifndef POLYBENCH_INCLUDE_INIT
@ -109,10 +126,6 @@ __host__ int main(int argc, char **argv)
/* Prevent dead-code elimination. All live-out data must be printed by the function call in argument. */ /* Prevent dead-code elimination. All live-out data must be printed by the function call in argument. */
polybench_prevent_dce(print_array(y)); polybench_prevent_dce(print_array(y));
free(A);
free(x);
free(y);
return 0; return 0;
} }