Reduce the size of partial shared malloc tests.

diff --git a/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.c b/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.c
index 019c38e..5327377 100644 (file)
--- a/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.c
+++ b/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.c
@@ -49,14 +49,14 @@ int main(int argc, char *argv[])
   MPI_Init(&argc, &argv);
   int rank;
   int size;
-  size_t mem_size = 0x10000000;
+  size_t mem_size = 0x1000000;
   size_t shared_blocks[] = {
-    0,         0x1234567,
-    0x1300000, 0x1300010,
-    0x3456789, 0x3457890,
-    0x4444444, 0x5555555,
-    0x5555565, 0x5600000,
-    0x8000000, 0x10000000
+    0,         0x123456,
+    0x130000, 0x130001,
+    0x345678, 0x345789,
+    0x444444, 0x555555,
+    0x555556, 0x560000,
+    0x800000, 0x1000000
   };
   int nb_blocks = (sizeof(shared_blocks)/sizeof(size_t))/2;
   MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -101,10 +101,10 @@ int main(int argc, char *argv[])
   // Then, even processes send a sub-part of their buffer their successor
   // Note that the last block should not be copied entirely
   if(rank%2 == 0) {
-    MPI_Send(buf+0x10000, mem_size-0xa000000, MPI_UINT8_T, rank+1, 0, MPI_COMM_WORLD);
+    MPI_Send(buf+0x10000, mem_size-0xa00000, MPI_UINT8_T, rank+1, 0, MPI_COMM_WORLD);
   }
   else {
-    MPI_Recv(buf+0x10000, mem_size-0xa000000, MPI_UINT8_T, rank-1, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+    MPI_Recv(buf+0x10000, mem_size-0xa00000, MPI_UINT8_T, rank-1, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE);
   }
 
 

diff --git a/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.tesh b/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.tesh
index 43ace2f..7c17af2 100644 (file)
--- a/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.tesh
+++ b/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.tesh
@@ -3,23 +3,23 @@ p Test compute
 ! output sort
 ! timeout 5
 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 4 ${bindir:=.}/macro-partial-shared-communication --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning
-> [3] The result of the (normal) communication check for block (0x1234567, 0x1300000) is: 1
-> [3] The result of the (normal) communication check for block (0x1300010, 0x3456789) is: 1
-> [3] The result of the (normal) communication check for block (0x3457890, 0x4444444) is: 1
-> [3] The result of the (normal) communication check for block (0x5555555, 0x5555565) is: 1
-> [3] The result of the (normal) communication check for block (0x5600000, 0x8000000) is: 1
-> [1] The result of the (normal) communication check for block (0x1234567, 0x1300000) is: 1
-> [1] The result of the (normal) communication check for block (0x1300010, 0x3456789) is: 1
-> [1] The result of the (normal) communication check for block (0x3457890, 0x4444444) is: 1
-> [1] The result of the (normal) communication check for block (0x5555555, 0x5555565) is: 1
-> [1] The result of the (normal) communication check for block (0x5600000, 0x8000000) is: 1
-> [3] The result of the (shifted) communication check for block (0x1234567, 0x1300000) is: 1
-> [3] The result of the (shifted) communication check for block (0x1300010, 0x3456789) is: 1
-> [3] The result of the (shifted) communication check for block (0x3457890, 0x4444444) is: 1
-> [3] The result of the (shifted) communication check for block (0x5555555, 0x5555565) is: 1
-> [3] The result of the (shifted) communication check for block (0x5600000, 0x8000000) is: 0
-> [1] The result of the (shifted) communication check for block (0x1234567, 0x1300000) is: 1
-> [1] The result of the (shifted) communication check for block (0x1300010, 0x3456789) is: 1
-> [1] The result of the (shifted) communication check for block (0x3457890, 0x4444444) is: 1
-> [1] The result of the (shifted) communication check for block (0x5555555, 0x5555565) is: 1
-> [1] The result of the (shifted) communication check for block (0x5600000, 0x8000000) is: 0
+> [3] The result of the (normal) communication check for block (0x123456, 0x130000) is: 1
+> [3] The result of the (normal) communication check for block (0x130001, 0x345678) is: 1
+> [3] The result of the (normal) communication check for block (0x345789, 0x444444) is: 1
+> [3] The result of the (normal) communication check for block (0x555555, 0x555556) is: 1
+> [3] The result of the (normal) communication check for block (0x560000, 0x800000) is: 1
+> [1] The result of the (normal) communication check for block (0x123456, 0x130000) is: 1
+> [1] The result of the (normal) communication check for block (0x130001, 0x345678) is: 1
+> [1] The result of the (normal) communication check for block (0x345789, 0x444444) is: 1
+> [1] The result of the (normal) communication check for block (0x555555, 0x555556) is: 1
+> [1] The result of the (normal) communication check for block (0x560000, 0x800000) is: 1
+> [3] The result of the (shifted) communication check for block (0x123456, 0x130000) is: 1
+> [3] The result of the (shifted) communication check for block (0x130001, 0x345678) is: 1
+> [3] The result of the (shifted) communication check for block (0x345789, 0x444444) is: 1
+> [3] The result of the (shifted) communication check for block (0x555555, 0x555556) is: 1
+> [3] The result of the (shifted) communication check for block (0x560000, 0x800000) is: 0
+> [1] The result of the (shifted) communication check for block (0x123456, 0x130000) is: 1
+> [1] The result of the (shifted) communication check for block (0x130001, 0x345678) is: 1
+> [1] The result of the (shifted) communication check for block (0x345789, 0x444444) is: 1
+> [1] The result of the (shifted) communication check for block (0x555555, 0x555556) is: 1
+> [1] The result of the (shifted) communication check for block (0x560000, 0x800000) is: 0

diff --git a/teshsuite/smpi/macro-partial-shared/macro-partial-shared.c b/teshsuite/smpi/macro-partial-shared/macro-partial-shared.c
index b783941..23b4a5b 100644 (file)
--- a/teshsuite/smpi/macro-partial-shared/macro-partial-shared.c
+++ b/teshsuite/smpi/macro-partial-shared/macro-partial-shared.c
@@ -48,14 +48,14 @@ int main(int argc, char *argv[])
   MPI_Init(&argc, &argv);
   int rank;
   int size;
-  size_t mem_size = 0x10000000;
+  size_t mem_size = 0x1000000;
   size_t shared_blocks[] = {
-    0,         0x1234567,
-    0x1300000, 0x1300010,
-    0x3456789, 0x3457890,
-    0x4444444, 0x5555555,
-    0x5555565, 0x5600000,
-    0x8000000, 0x10000000
+    0,         0x123456,
+    0x130000, 0x130001,
+    0x345678, 0x345789,
+    0x444444, 0x555555,
+    0x555556, 0x560000,
+    0x800000, 0x1000000
   };
   int nb_blocks = (sizeof(shared_blocks)/sizeof(size_t))/2;
   MPI_Comm_rank(MPI_COMM_WORLD, &rank);

diff --git a/teshsuite/smpi/macro-partial-shared/macro-partial-shared.tesh b/teshsuite/smpi/macro-partial-shared/macro-partial-shared.tesh
index 075ce12..9ae1914 100644 (file)
--- a/teshsuite/smpi/macro-partial-shared/macro-partial-shared.tesh
+++ b/teshsuite/smpi/macro-partial-shared/macro-partial-shared.tesh
@@ -3,47 +3,47 @@ p Test compute
 ! output sort
 ! timeout 5
 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 4 ${bindir:=.}/macro-partial-shared --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning
-> [0] The result of the shared check for block (0x0, 0x1234567) is: 1
-> [0] The result of the shared check for block (0x1300000, 0x1300010) is: 1
-> [0] The result of the shared check for block (0x3456789, 0x3457890) is: 1
-> [0] The result of the shared check for block (0x4444444, 0x5555555) is: 1
-> [0] The result of the shared check for block (0x5555565, 0x5600000) is: 1
-> [0] The result of the shared check for block (0x8000000, 0x10000000) is: 1
-> [3] The result of the shared check for block (0x0, 0x1234567) is: 1
-> [3] The result of the shared check for block (0x1300000, 0x1300010) is: 1
-> [3] The result of the shared check for block (0x3456789, 0x3457890) is: 1
-> [3] The result of the shared check for block (0x4444444, 0x5555555) is: 1
-> [3] The result of the shared check for block (0x5555565, 0x5600000) is: 1
-> [3] The result of the shared check for block (0x8000000, 0x10000000) is: 1
-> [1] The result of the shared check for block (0x0, 0x1234567) is: 1
-> [1] The result of the shared check for block (0x1300000, 0x1300010) is: 1
-> [1] The result of the shared check for block (0x3456789, 0x3457890) is: 1
-> [1] The result of the shared check for block (0x4444444, 0x5555555) is: 1
-> [1] The result of the shared check for block (0x5555565, 0x5600000) is: 1
-> [1] The result of the shared check for block (0x8000000, 0x10000000) is: 1
-> [2] The result of the shared check for block (0x0, 0x1234567) is: 1
-> [2] The result of the shared check for block (0x1300000, 0x1300010) is: 1
-> [2] The result of the shared check for block (0x3456789, 0x3457890) is: 1
-> [2] The result of the shared check for block (0x4444444, 0x5555555) is: 1
-> [2] The result of the shared check for block (0x5555565, 0x5600000) is: 1
-> [2] The result of the shared check for block (0x8000000, 0x10000000) is: 1
-> [0] The result of the private check for block (0x1234567, 0x1300000) is: 1
-> [0] The result of the private check for block (0x1300010, 0x3456789) is: 1
-> [0] The result of the private check for block (0x3457890, 0x4444444) is: 1
-> [0] The result of the private check for block (0x5555555, 0x5555565) is: 1
-> [0] The result of the private check for block (0x5600000, 0x8000000) is: 1
-> [3] The result of the private check for block (0x1234567, 0x1300000) is: 1
-> [3] The result of the private check for block (0x1300010, 0x3456789) is: 1
-> [3] The result of the private check for block (0x3457890, 0x4444444) is: 1
-> [3] The result of the private check for block (0x5555555, 0x5555565) is: 1
-> [3] The result of the private check for block (0x5600000, 0x8000000) is: 1
-> [1] The result of the private check for block (0x1234567, 0x1300000) is: 1
-> [1] The result of the private check for block (0x1300010, 0x3456789) is: 1
-> [1] The result of the private check for block (0x3457890, 0x4444444) is: 1
-> [1] The result of the private check for block (0x5555555, 0x5555565) is: 1
-> [1] The result of the private check for block (0x5600000, 0x8000000) is: 1
-> [2] The result of the private check for block (0x1234567, 0x1300000) is: 1
-> [2] The result of the private check for block (0x1300010, 0x3456789) is: 1
-> [2] The result of the private check for block (0x3457890, 0x4444444) is: 1
-> [2] The result of the private check for block (0x5555555, 0x5555565) is: 1
-> [2] The result of the private check for block (0x5600000, 0x8000000) is: 1
+> [0] The result of the shared check for block (0x0, 0x123456) is: 1
+> [0] The result of the shared check for block (0x130000, 0x130001) is: 1
+> [0] The result of the shared check for block (0x345678, 0x345789) is: 1
+> [0] The result of the shared check for block (0x444444, 0x555555) is: 1
+> [0] The result of the shared check for block (0x555556, 0x560000) is: 1
+> [0] The result of the shared check for block (0x800000, 0x1000000) is: 1
+> [3] The result of the shared check for block (0x0, 0x123456) is: 1
+> [3] The result of the shared check for block (0x130000, 0x130001) is: 1
+> [3] The result of the shared check for block (0x345678, 0x345789) is: 1
+> [3] The result of the shared check for block (0x444444, 0x555555) is: 1
+> [3] The result of the shared check for block (0x555556, 0x560000) is: 1
+> [3] The result of the shared check for block (0x800000, 0x1000000) is: 1
+> [1] The result of the shared check for block (0x0, 0x123456) is: 1
+> [1] The result of the shared check for block (0x130000, 0x130001) is: 1
+> [1] The result of the shared check for block (0x345678, 0x345789) is: 1
+> [1] The result of the shared check for block (0x444444, 0x555555) is: 1
+> [1] The result of the shared check for block (0x555556, 0x560000) is: 1
+> [1] The result of the shared check for block (0x800000, 0x1000000) is: 1
+> [2] The result of the shared check for block (0x0, 0x123456) is: 1
+> [2] The result of the shared check for block (0x130000, 0x130001) is: 1
+> [2] The result of the shared check for block (0x345678, 0x345789) is: 1
+> [2] The result of the shared check for block (0x444444, 0x555555) is: 1
+> [2] The result of the shared check for block (0x555556, 0x560000) is: 1
+> [2] The result of the shared check for block (0x800000, 0x1000000) is: 1
+> [0] The result of the private check for block (0x123456, 0x130000) is: 1
+> [0] The result of the private check for block (0x130001, 0x345678) is: 1
+> [0] The result of the private check for block (0x345789, 0x444444) is: 1
+> [0] The result of the private check for block (0x555555, 0x555556) is: 1
+> [0] The result of the private check for block (0x560000, 0x800000) is: 1
+> [3] The result of the private check for block (0x123456, 0x130000) is: 1
+> [3] The result of the private check for block (0x130001, 0x345678) is: 1
+> [3] The result of the private check for block (0x345789, 0x444444) is: 1
+> [3] The result of the private check for block (0x555555, 0x555556) is: 1
+> [3] The result of the private check for block (0x560000, 0x800000) is: 1
+> [1] The result of the private check for block (0x123456, 0x130000) is: 1
+> [1] The result of the private check for block (0x130001, 0x345678) is: 1
+> [1] The result of the private check for block (0x345789, 0x444444) is: 1
+> [1] The result of the private check for block (0x555555, 0x555556) is: 1
+> [1] The result of the private check for block (0x560000, 0x800000) is: 1
+> [2] The result of the private check for block (0x123456, 0x130000) is: 1
+> [2] The result of the private check for block (0x130001, 0x345678) is: 1
+> [2] The result of the private check for block (0x345789, 0x444444) is: 1
+> [2] The result of the private check for block (0x555555, 0x555556) is: 1
+> [2] The result of the private check for block (0x560000, 0x800000) is: 1