Cell: initial work for a hw-like batch buffer system

9 files changed, 190 insertions, 12 deletions

diff --git a/src/mesa/pipe/cell/common.h b/src/mesa/pipe/cell/common.h
index c00cee6a02d..450ca1d7224 100644
--- a/src/mesa/pipe/cell/common.h
+++ b/src/mesa/pipe/cell/common.h
@@ -47,13 +47,23 @@
 #define TILE_SIZE 32
 
 
+/**
+ * The low byte of a mailbox word contains the command opcode.
+ * Remaining higher bytes are command specific.
+ */
+#define CELL_CMD_OPCODE_MASK 0xf
+
 #define CELL_CMD_EXIT          1
 #define CELL_CMD_FRAMEBUFFER   2
 #define CELL_CMD_CLEAR_SURFACE 3
 #define CELL_CMD_FINISH        4
 #define CELL_CMD_RENDER        5
+#define CELL_CMD_BATCH         6
 
 
+#define CELL_NUM_BATCH_BUFFERS 2
+#define CELL_BATCH_BUFFER_SIZE 1024  /**< 16KB would be the max */
+
 
 /**
  * Tell SPUs about the framebuffer size, location
@@ -90,12 +100,23 @@ struct cell_command_render
 } ALIGN16_ATTRIB;
 
 
+/**
+ * Execute a command/batch buffer.
+ */
+struct cell_command_batch
+{
+   ushort buffer;    /**< which buffer [0, CELL_NUM_CMD_BUFFFERS-1] */
+   ushort length;    /**< in bytes */
+} ALIGN16_ATTRIB;
+
+
 /** XXX unions don't seem to work */
 struct cell_command
 {
    struct cell_command_framebuffer fb;
    struct cell_command_clear_surface clear;
    struct cell_command_render render;
+   struct cell_command_batch batch;
 } ALIGN16_ATTRIB;
 
 
@@ -105,6 +126,7 @@ struct cell_init_info
    unsigned id;
    unsigned num_spus;
    struct cell_command *cmd;
+   ubyte *batch_buffers[CELL_NUM_BATCH_BUFFERS];
 } ALIGN16_ATTRIB;
 
 
diff --git a/src/mesa/pipe/cell/ppu/Makefile b/src/mesa/pipe/cell/ppu/Makefile
index 44f14c0211c..f7e3dd09f44 100644
--- a/src/mesa/pipe/cell/ppu/Makefile
+++ b/src/mesa/pipe/cell/ppu/Makefile
@@ -16,6 +16,7 @@ SPU_CODE_MODULE = ../spu/g3d_spu.a
 
 
 SOURCES = \
+	cell_batch.c \
 	cell_context.c \
 	cell_draw_arrays.c \
 	cell_flush.c \
diff --git a/src/mesa/pipe/cell/ppu/cell_batch.c b/src/mesa/pipe/cell/ppu/cell_batch.c
new file mode 100644
index 00000000000..a71573cbf72
--- /dev/null
+++ b/src/mesa/pipe/cell/ppu/cell_batch.c
@@ -0,0 +1,85 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+#include "cell_context.h"
+#include "cell_batch.h"
+#include "cell_spu.h"
+
+
+void
+cell_batch_flush(struct cell_context *cell)
+{
+   const uint batch = cell->cur_batch;
+   const uint size = cell->batch_buffer_size[batch];
+   uint i, cmd_word;
+
+   if (size == 0)
+      return;
+
+   assert(batch < CELL_NUM_BATCH_BUFFERS);
+
+   printf("cell_batch_dispatch: buf %u, size %u\n", batch, size);
+          
+   cmd_word = CELL_CMD_BATCH | (batch << 8) | (size << 16);
+
+   for (i = 0; i < cell->num_spus; i++) {
+      send_mbox_message(cell_global.spe_contexts[i], cmd_word);
+   }
+
+   /* XXX wait on DMA xfer of prev buffer to complete */
+
+   cell->cur_batch = (batch + 1) % CELL_NUM_BATCH_BUFFERS;
+
+   cell->batch_buffer_size[cell->cur_batch] = 0;  /* empty */
+}
+
+
+/**
+ * \param cmd  command to append
+ * \param length  command size in bytes
+ */
+void
+cell_batch_append(struct cell_context *cell, const void *cmd, uint length)
+{
+   uint size;
+
+   assert(cell->cur_batch >= 0);
+
+   size = cell->batch_buffer_size[cell->cur_batch];
+
+   if (size + length > CELL_BATCH_BUFFER_SIZE) {
+      cell_batch_flush(cell);
+      size = 0;
+   }
+
+   assert(size + length <= CELL_BATCH_BUFFER_SIZE);
+
+   memcpy(cell->batch_buffer[cell->cur_batch] + size, cmd, length);
+
+   cell->batch_buffer_size[cell->cur_batch] = size + length;
+}
diff --git a/src/mesa/pipe/cell/ppu/cell_batch.h b/src/mesa/pipe/cell/ppu/cell_batch.h
new file mode 100644
index 00000000000..02d7edf8b97
--- /dev/null
+++ b/src/mesa/pipe/cell/ppu/cell_batch.h
@@ -0,0 +1,40 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+#ifndef CELL_BATCH_H
+#define CELL_BATCH_H
+
+
+extern void
+cell_batch_flush(struct cell_context *cell);
+
+extern void
+cell_batch_append(struct cell_context *cell, const void *cmd, uint length);
+
+
+#endif /* CELL_BATCH_H */
diff --git a/src/mesa/pipe/cell/ppu/cell_context.c b/src/mesa/pipe/cell/ppu/cell_context.c
index 000217b2590..6ba3b0d4138 100644
--- a/src/mesa/pipe/cell/ppu/cell_context.c
+++ b/src/mesa/pipe/cell/ppu/cell_context.c
@@ -160,6 +160,7 @@ struct pipe_context *
 cell_create_context(struct pipe_winsys *winsys, struct cell_winsys *cws)
 {
    struct cell_context *cell;
+   uint i;
 
    /* some fields need to be 16-byte aligned, so align the whole object */
    cell = (struct cell_context*) align_malloc(sizeof(struct cell_context), 16);
@@ -245,7 +246,11 @@ cell_create_context(struct pipe_winsys *winsys, struct cell_winsys *cws)
     */
    cell->num_spus = 6;
 
-   cell_start_spus(cell->num_spus);
+   cell_start_spus(cell);
+
+   for (i = 0; i < CELL_NUM_BATCH_BUFFERS; i++) {
+      cell->batch_buffer_size[i] = 0;
+   }
 
 #if 0
    test_spus(cell);
diff --git a/src/mesa/pipe/cell/ppu/cell_context.h b/src/mesa/pipe/cell/ppu/cell_context.h
index d7754d5d61f..94d8f08da80 100644
--- a/src/mesa/pipe/cell/ppu/cell_context.h
+++ b/src/mesa/pipe/cell/ppu/cell_context.h
@@ -96,6 +96,11 @@ struct cell_context
 
 
    uint num_spus;
+
+   ubyte batch_buffer_size[CELL_NUM_BATCH_BUFFERS];
+   ubyte batch_buffer[CELL_NUM_BATCH_BUFFERS][CELL_BATCH_BUFFER_SIZE] ALIGN16_ATTRIB;
+   int cur_batch;  /**< which batch buffer is being filled */
+
 };
 
 
diff --git a/src/mesa/pipe/cell/ppu/cell_spu.c b/src/mesa/pipe/cell/ppu/cell_spu.c
index 44ad3f22b39..88a620e6693 100644
--- a/src/mesa/pipe/cell/ppu/cell_spu.c
+++ b/src/mesa/pipe/cell/ppu/cell_spu.c
@@ -95,11 +95,11 @@ static void *cell_thread_function(void *arg)
  * Create the SPU threads
  */
 void
-cell_start_spus(uint num_spus)
+cell_start_spus(struct cell_context *cell)
 {
-   uint i;
+   uint i, j;
 
-   assert(num_spus <= MAX_SPUS);
+   assert(cell->num_spus <= MAX_SPUS);
 
    ASSERT_ALIGN16(&cell_global.command[0]);
    ASSERT_ALIGN16(&cell_global.command[1]);
@@ -107,10 +107,13 @@ cell_start_spus(uint num_spus)
    ASSERT_ALIGN16(&cell_global.inits[0]);
    ASSERT_ALIGN16(&cell_global.inits[1]);
 
-   for (i = 0; i < num_spus; i++) {
+   for (i = 0; i < cell->num_spus; i++) {
       cell_global.inits[i].id = i;
-      cell_global.inits[i].num_spus = num_spus;
+      cell_global.inits[i].num_spus = cell->num_spus;
       cell_global.inits[i].cmd = &cell_global.command[i];
+      for (j = 0; j < CELL_NUM_BATCH_BUFFERS; j++) {
+         cell_global.inits[i].batch_buffers[j] = cell->batch_buffer[j];
+      }
 
       cell_global.spe_contexts[i] = spe_context_create(0, NULL);
       if (!cell_global.spe_contexts[i]) {
diff --git a/src/mesa/pipe/cell/ppu/cell_spu.h b/src/mesa/pipe/cell/ppu/cell_spu.h
index d11001af62b..b4bfbced808 100644
--- a/src/mesa/pipe/cell/ppu/cell_spu.h
+++ b/src/mesa/pipe/cell/ppu/cell_spu.h
@@ -71,18 +71,18 @@ extern uint
 wait_mbox_message(spe_context_ptr_t ctx);
 
 
-void
-cell_start_spus(uint num_spus);
+extern void
+cell_start_spus(struct cell_context *cell);
 
 
-void
+extern void
 finish_all(uint num_spus);
 
-void
+extern void
 test_spus(struct cell_context *cell);
 
 
-void
+extern void
 cell_spu_exit(struct cell_context *cell);
 
 
diff --git a/src/mesa/pipe/cell/spu/main.c b/src/mesa/pipe/cell/spu/main.c
index 20f15029e14..04bb087cf9f 100644
--- a/src/mesa/pipe/cell/spu/main.c
+++ b/src/mesa/pipe/cell/spu/main.c
@@ -322,6 +322,13 @@ render(const struct cell_command_render *render)
 
 
 
+static void
+batch(const struct cell_command_batch *batch)
+{
+}
+
+
+
 /**
  * Temporary/simple main loop for SPEs: Get a command, execute it, repeat.
  */
@@ -359,7 +366,7 @@ main_loop(void)
               0  /* rid */);
       wait_on_mask( 1 << tag );
 
-      switch (opcode) {
+      switch (opcode & CELL_CMD_OPCODE_MASK) {
       case CELL_CMD_EXIT:
          if (Debug)
             printf("SPU %u: EXIT\n", init.id);
@@ -403,6 +410,16 @@ main_loop(void)
          render(&cmd.render);
          break;
 
+      case CELL_CMD_BATCH:
+         /* execute a batch buffer */
+         if (Debug)
+            printf("SPU %u: BATCH buffer %u, len %u\n",
+                   init.id,
+                   cmd.batch.buffer,
+                   cmd.batch.length);
+         batch(&cmd.batch);
+         break;
+
       case CELL_CMD_FINISH:
          if (Debug)
             printf("SPU %u: FINISH\n", init.id);