summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/cell
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/pipe/cell')
-rw-r--r--src/mesa/pipe/cell/common.h1
-rw-r--r--src/mesa/pipe/cell/ppu/cell_flush.c6
-rw-r--r--src/mesa/pipe/cell/ppu/cell_spu.c85
-rw-r--r--src/mesa/pipe/cell/ppu/cell_spu.h29
-rw-r--r--src/mesa/pipe/cell/ppu/cell_surface.c33
-rw-r--r--src/mesa/pipe/cell/spu/main.c17
-rw-r--r--src/mesa/pipe/cell/spu/main.h2
7 files changed, 97 insertions, 76 deletions
diff --git a/src/mesa/pipe/cell/common.h b/src/mesa/pipe/cell/common.h
index a87417743a..c986b59a5d 100644
--- a/src/mesa/pipe/cell/common.h
+++ b/src/mesa/pipe/cell/common.h
@@ -91,6 +91,7 @@ struct cell_command
} ALIGN16_ATTRIB;
+/** This is the object passed to spe_create_thread() */
struct cell_init_info
{
unsigned id;
diff --git a/src/mesa/pipe/cell/ppu/cell_flush.c b/src/mesa/pipe/cell/ppu/cell_flush.c
index 39b72c435d..b1ff0e51cd 100644
--- a/src/mesa/pipe/cell/ppu/cell_flush.c
+++ b/src/mesa/pipe/cell/ppu/cell_flush.c
@@ -26,8 +26,6 @@
**************************************************************************/
-#include <cbe_mfc.h>
-
#include "cell_context.h"
#include "cell_flush.h"
#include "cell_spu.h"
@@ -43,12 +41,12 @@ cell_flush(struct pipe_context *pipe, unsigned flags)
/* Send CMD_FINISH to all SPUs */
for (i = 0; i < cell->num_spus; i++) {
- send_mbox_message(spe_contexts[i], CELL_CMD_FINISH);
+ send_mbox_message(cell_global.spe_contexts[i], CELL_CMD_FINISH);
}
/* Wait for ack */
for (i = 0; i < cell->num_spus; i++) {
- uint k = wait_mbox_message(spe_contexts[i]);
+ uint k = wait_mbox_message(cell_global.spe_contexts[i]);
assert(k == CELL_CMD_FINISH);
}
}
diff --git a/src/mesa/pipe/cell/ppu/cell_spu.c b/src/mesa/pipe/cell/ppu/cell_spu.c
index 7d41c660e4..55a0d5038b 100644
--- a/src/mesa/pipe/cell/ppu/cell_spu.c
+++ b/src/mesa/pipe/cell/ppu/cell_spu.c
@@ -26,7 +26,6 @@
**************************************************************************/
-#include <cbe_mfc.h>
#include <pthread.h>
#include "cell_spu.h"
@@ -41,17 +40,7 @@ helpful headers:
*/
-/**
- * SPU/SPE handles, etc
- */
-spe_context_ptr_t spe_contexts[MAX_SPUS];
-pthread_t spe_threads[MAX_SPUS];
-
-/**
- * Data sent to SPUs
- */
-struct cell_init_info inits[MAX_SPUS];
-struct cell_command command[MAX_SPUS];
+struct cell_global_info cell_global;
/**
@@ -89,8 +78,15 @@ static void *cell_thread_function(void *arg)
{
struct cell_init_info *init = (struct cell_init_info *) arg;
unsigned entry = SPE_DEFAULT_ENTRY;
-
- spe_context_run(spe_contexts[init->id], &entry, 0, init, NULL, NULL);
+
+ ASSERT_ALIGN16(init);
+
+ if (spe_context_run(cell_global.spe_contexts[init->id], &entry, 0,
+ init, NULL, NULL) < 0) {
+ fprintf(stderr, "spe_context_run() failed\n");
+ exit(1);
+ }
+
pthread_exit(NULL);
}
@@ -103,25 +99,32 @@ cell_start_spus(uint num_spus)
{
uint i;
- assert((sizeof(struct cell_command) & 0xf) == 0);
- ASSERT_ALIGN16(&command[0]);
- ASSERT_ALIGN16(&command[1]);
+ assert(num_spus <= MAX_SPUS);
- assert((sizeof(struct cell_init_info) & 0xf) == 0);
- ASSERT_ALIGN16(&inits[0]);
- ASSERT_ALIGN16(&inits[1]);
+ ASSERT_ALIGN16(&cell_global.command[0]);
+ ASSERT_ALIGN16(&cell_global.command[1]);
- for (i = 0; i < num_spus; i++) {
- inits[i].id = i;
- inits[i].num_spus = num_spus;
- inits[i].cmd = &command[i];
+ ASSERT_ALIGN16(&cell_global.inits[0]);
+ ASSERT_ALIGN16(&cell_global.inits[1]);
- spe_contexts[i] = spe_context_create(0, NULL);
+ for (i = 0; i < num_spus; i++) {
+ cell_global.inits[i].id = i;
+ cell_global.inits[i].num_spus = num_spus;
+ cell_global.inits[i].cmd = &cell_global.command[i];
+
+ cell_global.spe_contexts[i] = spe_context_create(0, NULL);
+ if (!cell_global.spe_contexts[i]) {
+ fprintf(stderr, "spe_context_create() failed\n");
+ exit(1);
+ }
- spe_program_load(spe_contexts[i], &g3d_spu);
+ if (spe_program_load(cell_global.spe_contexts[i], &g3d_spu)) {
+ fprintf(stderr, "spe_program_load() failed\n");
+ exit(1);
+ }
- pthread_create(&spe_threads[i], NULL, cell_thread_function,
- & inits[i]);
+ pthread_create(&cell_global.spe_threads[i], NULL, &cell_thread_function,
+ &cell_global.inits[i]);
}
}
@@ -134,13 +137,13 @@ finish_all(uint num_spus)
uint i;
for (i = 0; i < num_spus; i++) {
- send_mbox_message(spe_contexts[i], CELL_CMD_FINISH);
+ send_mbox_message(cell_global.spe_contexts[i], CELL_CMD_FINISH);
}
for (i = 0; i < num_spus; i++) {
/* wait for mbox message */
unsigned k;
- while (spe_out_mbox_read(spe_contexts[i], &k, 1) < 1)
+ while (spe_out_mbox_read(cell_global.spe_contexts[i], &k, 1) < 1)
;
assert(k == CELL_CMD_FINISH);
@@ -161,16 +164,16 @@ test_spus(struct cell_context *cell)
sleep(2);
for (i = 0; i < cell->num_spus; i++) {
- command[i].fb.start = surf->map;
- command[i].fb.width = surf->width;
- command[i].fb.height = surf->height;
- command[i].fb.format = PIPE_FORMAT_A8R8G8B8_UNORM;
- send_mbox_message(spe_contexts[i], CELL_CMD_FRAMEBUFFER);
+ cell_global.command[i].fb.start = surf->map;
+ cell_global.command[i].fb.width = surf->width;
+ cell_global.command[i].fb.height = surf->height;
+ cell_global.command[i].fb.format = PIPE_FORMAT_A8R8G8B8_UNORM;
+ send_mbox_message(cell_global.spe_contexts[i], CELL_CMD_FRAMEBUFFER);
}
for (i = 0; i < cell->num_spus; i++) {
- command[i].clear.value = 0xff880044; /* XXX */
- send_mbox_message(spe_contexts[i], CELL_CMD_CLEAR_TILES);
+ cell_global.command[i].clear.value = 0xff880044; /* XXX */
+ send_mbox_message(cell_global.spe_contexts[i], CELL_CMD_CLEAR_TILES);
}
finish_all(cell->num_spus);
@@ -182,7 +185,7 @@ test_spus(struct cell_context *cell)
}
for (i = 0; i < cell->num_spus; i++) {
- send_mbox_message(spe_contexts[i], CELL_CMD_EXIT);
+ send_mbox_message(cell_global.spe_contexts[i], CELL_CMD_EXIT);
}
}
@@ -193,11 +196,11 @@ test_spus(struct cell_context *cell)
void
wait_spus(uint num_spus)
{
- unsigned i;
+ uint i;
void *value;
for (i = 0; i < num_spus; i++) {
- pthread_join(spe_threads[i], &value);
+ pthread_join(cell_global.spe_threads[i], &value);
}
}
@@ -211,7 +214,7 @@ cell_spu_exit(struct cell_context *cell)
unsigned i;
for (i = 0; i < cell->num_spus; i++) {
- send_mbox_message(spe_contexts[i], CELL_CMD_EXIT);
+ send_mbox_message(cell_global.spe_contexts[i], CELL_CMD_EXIT);
}
wait_spus(cell->num_spus);
diff --git a/src/mesa/pipe/cell/ppu/cell_spu.h b/src/mesa/pipe/cell/ppu/cell_spu.h
index 09d5e23a88..612cb45c59 100644
--- a/src/mesa/pipe/cell/ppu/cell_spu.h
+++ b/src/mesa/pipe/cell/ppu/cell_spu.h
@@ -39,18 +39,29 @@
#define MAX_SPUS 8
/**
- * SPU/SPE handles, etc
+ * Global vars, for now anyway.
*/
-extern spe_program_handle_t g3d_spu;
-extern spe_context_ptr_t spe_contexts[MAX_SPUS];
-extern pthread_t spe_threads[MAX_SPUS];
+struct cell_global_info
+{
+ /**
+ * SPU/SPE handles, etc
+ */
+ spe_context_ptr_t spe_contexts[MAX_SPUS];
+ pthread_t spe_threads[MAX_SPUS];
+ /**
+ * Data sent to SPUs
+ */
+ struct cell_init_info inits[MAX_SPUS];
+ struct cell_command command[MAX_SPUS];
+};
-/**
- * Data sent to SPUs
- */
-extern struct cell_init_info inits[MAX_SPUS];
-extern struct cell_command command[MAX_SPUS];
+
+extern struct cell_global_info cell_global;
+
+
+/** This is the handle for the actual SPE code */
+extern spe_program_handle_t g3d_spu;
extern void
diff --git a/src/mesa/pipe/cell/ppu/cell_surface.c b/src/mesa/pipe/cell/ppu/cell_surface.c
index 03b0988dc3..143f554b60 100644
--- a/src/mesa/pipe/cell/ppu/cell_surface.c
+++ b/src/mesa/pipe/cell/ppu/cell_surface.c
@@ -52,36 +52,39 @@ cell_clear_surface(struct pipe_context *pipe, struct pipe_surface *ps,
pipe_surface_map(ps);
for (i = 0; i < cell->num_spus; i++) {
- command[i].fb.start = ps->map;
- command[i].fb.width = ps->width;
- command[i].fb.height = ps->height;
- command[i].fb.format = ps->format;
- send_mbox_message(spe_contexts[i], CELL_CMD_FRAMEBUFFER);
+ struct cell_command_framebuffer *fb = &cell_global.command[i].fb;
+ fb->start = ps->map;
+ fb->width = ps->width;
+ fb->height = ps->height;
+ fb->format = ps->format;
+ send_mbox_message(cell_global.spe_contexts[i], CELL_CMD_FRAMEBUFFER);
}
for (i = 0; i < cell->num_spus; i++) {
/* XXX clear color varies per-SPU for debugging */
- command[i].clear.value = clearValue | (i << 21);
- send_mbox_message(spe_contexts[i], CELL_CMD_CLEAR_TILES);
+ cell_global.command[i].clear.value = clearValue | (i << 21);
+ send_mbox_message(cell_global.spe_contexts[i], CELL_CMD_CLEAR_TILES);
}
#if 1
/* XXX Draw a test triangle over the cleared surface */
for (i = 0; i < cell->num_spus; i++) {
/* Same triangle data for all SPUs, of course: */
- command[i].tri.x0 = 20.0;
- command[i].tri.y0 = ps->height - 20;
+ struct cell_command_triangle *tri = &cell_global.command[i].tri;
- command[i].tri.x1 = ps->width - 20.0;
- command[i].tri.y1 = ps->height - 20;
+ tri->x0 = 20.0;
+ tri->y0 = ps->height - 20;
- command[i].tri.x2 = ps->width / 2;
- command[i].tri.y2 = 20.0;
+ tri->x1 = ps->width - 20.0;
+ tri->y1 = ps->height - 20;
+
+ tri->x2 = ps->width / 2;
+ tri->y2 = 20.0;
/* XXX color varies per SPU */
- command[i].tri.color = 0xffff00 | ((i*40)<<24); /* yellow */
+ tri->color = 0xffff00 | ((i*40)<<24); /* yellow */
- send_mbox_message(spe_contexts[i], CELL_CMD_TRIANGLE);
+ send_mbox_message(cell_global.spe_contexts[i], CELL_CMD_TRIANGLE);
}
#endif
}
diff --git a/src/mesa/pipe/cell/spu/main.c b/src/mesa/pipe/cell/spu/main.c
index 83880bc906..6a77e3e9fa 100644
--- a/src/mesa/pipe/cell/spu/main.c
+++ b/src/mesa/pipe/cell/spu/main.c
@@ -44,7 +44,7 @@ helpful headers:
/opt/ibm/cell-sdk/prototype/sysroot/usr/include/libmisc.h
*/
-struct cell_init_info init;
+volatile struct cell_init_info init;
struct framebuffer fb;
@@ -238,17 +238,21 @@ main_loop(void)
+/**
+ * SPE entrypoint.
+ * Note: example programs declare params as 'unsigned long long' but
+ * that doesn't work.
+ */
int
-main(unsigned long long speid,
- unsigned long long argp,
- unsigned long long envp)
+main(unsigned long speid, unsigned long argp)
{
int tag = 0;
+ (void) speid;
+
DefaultTag = 1;
- (void) speid;
- (void) envp;
+ printf("SPU: main() speid=%lu\n", speid);
mfc_get(&init, /* dest */
(unsigned int) argp, /* src */
@@ -258,6 +262,7 @@ main(unsigned long long speid,
0 /* rid */);
wait_on_mask( 1 << tag );
+
main_loop();
return 0;
diff --git a/src/mesa/pipe/cell/spu/main.h b/src/mesa/pipe/cell/spu/main.h
index 882be7f1c5..8c2796387f 100644
--- a/src/mesa/pipe/cell/spu/main.h
+++ b/src/mesa/pipe/cell/spu/main.h
@@ -34,7 +34,7 @@
#include "pipe/cell/common.h"
-extern struct cell_init_info init;
+extern volatile struct cell_init_info init;
struct framebuffer {
void *start;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 08:25:59 +0000