Refactor PUT and Large PUT tests

RipleyTom · Feb 28, 2024 · 5e47a35 · 5e47a35
1 parent 62c7fc1
commit 5e47a35
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/task_largeput.c b/task_largeput.c
@@ -12,11 +12,20 @@ uint8_t ls_buf[16384] __attribute__((aligned(128)));
 
 int cellSpursTaskMain(qword argTask, uint64_t argTaskset)
 {
-    const uint64_t addr = argTaskset;
+    const uint64_t task_id = ((vec_uint4)argTask)[0];
+    const uint64_t task_mask = 1 << task_id;
+    const uint64_t addr = argTaskset + (task_id * 16384);
+
+    for (int index = 0; index < 16384; index++)
+    {
+        ls_buf[index] = (index + task_id) % 0xFF;
+    }
 
     for (unsigned long counter = 0; counter < NUM_LARGE_PUTC; counter++)
     {
-        cellDmaPut(ls_buf, addr, 16384, 0, 0, 0);
+        cellDmaPut(ls_buf, addr, 16384, task_id, 0, 0);
+        ls_buf[counter % 16384]++;
+        cellDmaWaitTagStatusAny(task_mask);
     }
 
     return 0;

diff --git a/task_put.c b/task_put.c
@@ -6,13 +6,15 @@
 
 CELL_SPU_LS_PARAM(16 * 1024, 16 * 1024);
 
-#define NUM_PUTC 10000000
+#define NUM_PUTC 30000000
 
 vec_uint4 ls_buf[128 / sizeof(vec_uint4)] __attribute__((aligned(128)));
 
 int cellSpursTaskMain(qword argTask, uint64_t argTaskset)
 {
-    const uint64_t addr = argTaskset;
+    const uint64_t task_id = ((vec_uint4)argTask)[0];
+    const uint64_t task_mask = 1 << task_id;
+    const uint64_t addr = argTaskset + (task_id * 128);
 
     for (int index = 0; index < (128 / sizeof(vec_uint4)); index++)
     {
@@ -26,8 +28,9 @@ int cellSpursTaskMain(qword argTask, uint64_t argTaskset)
 
     for (unsigned long counter = 0; counter < NUM_PUTC; counter++)
     {
-        cellDmaPut(&ls_buf[counter % ((128 - 32) / sizeof(vec_uint4))], addr, 32, 0, 0, 0);
+        cellDmaPut(&ls_buf[counter % ((128 - 32) / sizeof(vec_uint4))], addr, 32, task_id, 0, 0);
         ls_buf[counter % (128 / sizeof(vec_uint4))] = spu_add(ls_buf[counter % (128 / sizeof(vec_uint4))], toinc);
+        cellDmaWaitTagStatusAny(task_mask);
     }
 
     return 0;

diff --git a/test_block.c b/test_block.c
@@ -8,7 +8,7 @@
 
 #define NUM_SPU 6
 
-unsigned char bigbuf[128] __attribute__((aligned(128)));
+unsigned char bigbuf[128 * NUM_SPU] __attribute__((aligned(128)));
 
 int test_block(CellSpurs2 *spurs2, const CellSpursTaskBinInfo *program)
 {
@@ -31,7 +31,7 @@ int test_block(CellSpurs2 *spurs2, const CellSpursTaskBinInfo *program)
         ctx[index] = memalign(128, program->sizeContext);
         for (int subdex = 0; subdex < 4; subdex++)
         {
-            args[index].u32[subdex] = (index * 10000000) + subdex;
+            args[index].u32[subdex] = index + (subdex * 16);
         }
 
         ret = cellSpursCreateTask2WithBinInfo(taskset, &tids[index], program, &args[index], ctx[index], NULL, NULL);

diff --git a/test_largeblock.c b/test_largeblock.c
@@ -8,7 +8,7 @@
 
 #define NUM_SPU 6
 
-unsigned char largebuf[16384] __attribute__((aligned(128)));
+unsigned char largebuf[16384 * NUM_SPU] __attribute__((aligned(128)));
 
 int test_largeblock(CellSpurs2 *spurs2, const CellSpursTaskBinInfo *program)
 {
@@ -31,7 +31,7 @@ int test_largeblock(CellSpurs2 *spurs2, const CellSpursTaskBinInfo *program)
         ctx[index] = memalign(128, program->sizeContext);
         for (int subdex = 0; subdex < 4; subdex++)
         {
-            args[index].u32[subdex] = (index * 10000000) + subdex;
+            args[index].u32[subdex] = index + (subdex * 16);
         }
 
         ret = cellSpursCreateTask2WithBinInfo(taskset, &tids[index], program, &args[index], ctx[index], NULL, NULL);