Commit b66e6190 authored by David Goz's avatar David Goz 😴
Browse files

small refinements serial/ omp/

parent 97eda2f1

jacobi/openmp/not_opt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ valgrind_callgrind: $(PROG_CALLGRIND) 


valgrind_cachegrind: $(PROG_CACHEGRIND)

	@echo 'oooOOO... valgrind_cachegrind ...OOOooo'

	valgrind --tool=cachegrind --log-file=valgrind_cachegrind_log_.%p.txt ./$< 128 128 2

	valgrind --tool=cachegrind --cache-sim=yes --log-file=valgrind_cachegrind_log_.%p.txt ./$< 128 128 2

	@echo '$$ cg_annotate --auto=yes cachegrind.out.<pid> | less'

	@echo '(kcachegrind is required in order to visualize the output using the GUI)'

	@echo 'oooOOO... valgrind_cachegrind ...OOOooo'

jacobi/openmp/not_opt/src/jacobi_2D_omp_not_opt.c

+1 −7
Original line number Diff line number Diff line
@@ -234,9 +234,6 @@ void JacobiAlgorithm(MyData **const restrict Phi, 
    #pragma omp barrier

#endif /* DEBUG */





    /***** MISSING LOOP(s) PARALLELIZATION *****/

    

    for (int j=jbeg ; j<=jend ; j++)

      {

	for (int i=ibeg ; i<=iend ; i++)
@@ -244,10 +241,7 @@ void JacobiAlgorithm(MyData **const restrict Phi, 
	    Phi[j][i] = 0.25 * (Phi0[j][i-1] + Phi0[j][i+1] +

				Phi0[j-1][i] + Phi0[j+1][i]);



	    #pragma omp critical

	    {

	    *error += delta[X] * delta[Y] * fabs(Phi[j][i] - Phi0[j][i]);

	    }

	  } /* loop over columns */

      } /* loop over rows */

  } /* omp parallel */

jacobi/serial/not_opt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ valgrind_callgrind: $(PROG_CALLGRIND) 


valgrind_cachegrind: $(PROG_CACHEGRIND)

	@echo 'oooOOO... valgrind_cachegrind ...OOOooo'

	valgrind --tool=cachegrind --log-file=valgrind_cachegrind_log_.%p.txt ./$< 128 128

	valgrind --tool=cachegrind --cache-sim=yes --log-file=valgrind_cachegrind_log_.%p.txt ./$< 128 128

	@echo '$$ cg_annotate --auto=yes cachegrind.out.<pid> | less'

	@echo '(kcachegrind is required in order to visualize the output using the GUI)'

	@echo 'oooOOO... valgrind_cachegrind ...OOOooo'

jacobi_solutions/serial/not_opt/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ valgrind_callgrind: $(PROG_CALLGRIND) 


valgrind_cachegrind: $(PROG_CACHEGRIND)

	@echo 'oooOOO... valgrind_cachegrind ...OOOooo'

	valgrind --tool=cachegrind --log-file=valgrind_cachegrind_log_.%p.txt ./$< 128 128

	valgrind --tool=cachegrind --cache-sim=yes --log-file=valgrind_cachegrind_log_.%p.txt ./$< 128 128

	@echo '$$ cg_annotate --auto=yes cachegrind.out.<pid> | less'

	@echo '(kcachegrind is required in order to visualize the output using the GUI)'

	@echo 'oooOOO... valgrind_cachegrind ...OOOooo'

jacobi_solutions/serial/not_opt/src/jacobi_2D_serial_not_opt.c

+6 −3
Original line number Diff line number Diff line
@@ -214,10 +214,13 @@ void JacobiAlgorithm(MyData **const restrict Phi, 
    {

      for (int i=ibeg ; i<=iend ; i++)

	{

	  Phi[j][i] = 0.25 * (Phi0[j][i-1] + Phi0[j][i+1] +

			      Phi0[j-1][i] + Phi0[j+1][i]);

	  Phi[j][i] = 0.25 * (Phi0[j][i-1] +

			      Phi0[j][i+1] +

			      Phi0[j-1][i] +

			      Phi0[j+1][i]);

                

	  *error += delta[X] * delta[Y] * fabs(Phi[j][i] - Phi0[j][i]);

	  *error += (delta[X] * delta[Y]) *

	            fabs(Phi[j][i] - Phi0[j][i]);

	} /* loop over columns */

    } /* loop over rows */