cell: checkpoint: support for function calls in SPU shaders
Will be used for instructions like SIN/COS/POW/TEX/etc. The PPU needs to know the address of some functions in the SPU address space. Send that info to the PPU/main memory rather than patch up shaders on the SPU side. Not finished/tested yet...
This commit is contained in:
Brian Paul
parent
f5127909fb
commit
164fb1299e
|
|
@ -130,7 +130,7 @@ struct cell_command_fragment_ops
|
|||
#define SPU_MAX_FRAGMENT_PROGRAM_INSTS 128
|
||||
|
||||
/**
|
||||
* Command to send a fragment progra to SPUs.
|
||||
* Command to send a fragment program to SPUs.
|
||||
*/
|
||||
struct cell_command_fragment_program
|
||||
{
|
||||
|
|
@ -267,6 +267,20 @@ struct cell_command
|
|||
} ALIGN16_ATTRIB;
|
||||
|
||||
|
||||
#define MAX_SPU_FUNCTIONS 12
|
||||
/**
|
||||
* Used to tell the PPU about the address of particular functions in the
|
||||
* SPU's address space.
|
||||
*/
|
||||
struct cell_spu_function_info
|
||||
{
|
||||
uint num;
|
||||
char names[MAX_SPU_FUNCTIONS][16];
|
||||
uint addrs[MAX_SPU_FUNCTIONS];
|
||||
char pad[12]; /**< Pad struct to multiple of 16 bytes (256 currently) */
|
||||
};
|
||||
|
||||
|
||||
/** This is the object passed to spe_create_thread() */
|
||||
struct cell_init_info
|
||||
{
|
||||
|
|
@ -278,6 +292,8 @@ struct cell_init_info
|
|||
/** Buffers for command batches, vertex/index data */
|
||||
ubyte *buffers[CELL_NUM_BUFFERS];
|
||||
uint *buffer_status; /**< points at cell_context->buffer_status */
|
||||
|
||||
struct cell_spu_function_info *spu_functions;
|
||||
} ALIGN16_ATTRIB;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -149,6 +149,7 @@ struct cell_context
|
|||
/** Mapped constant buffers */
|
||||
void *mapped_constants[PIPE_SHADER_TYPES];
|
||||
|
||||
struct cell_spu_function_info spu_functions ALIGN16_ATTRIB;
|
||||
|
||||
uint num_spus;
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
* \author Brian Paul
|
||||
*/
|
||||
|
||||
|
||||
#include <math.h>
|
||||
#include "pipe/p_defines.h"
|
||||
#include "pipe/p_state.h"
|
||||
#include "pipe/p_shader_tokens.h"
|
||||
|
|
@ -64,6 +64,7 @@
|
|||
*/
|
||||
struct codegen
|
||||
{
|
||||
struct cell_context *cell;
|
||||
int inputs_reg; /**< 1st function parameter */
|
||||
int outputs_reg; /**< 2nd function parameter */
|
||||
int constants_reg; /**< 3rd function parameter */
|
||||
|
|
@ -1076,6 +1077,76 @@ emit_FRC(struct codegen *gen, const struct tgsi_full_instruction *inst)
|
|||
}
|
||||
|
||||
|
||||
#if 0
|
||||
static void
|
||||
print_functions(struct cell_context *cell)
|
||||
{
|
||||
struct cell_spu_function_info *funcs = &cell->spu_functions;
|
||||
uint i;
|
||||
for (i = 0; i < funcs->num; i++) {
|
||||
printf("SPU func %u: %s at %u\n",
|
||||
i, funcs->names[i], funcs->addrs[i]);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/**
|
||||
* Emit code to call a SPU function.
|
||||
* Used to implement instructions like SIN/COS/POW/TEX/etc.
|
||||
*/
|
||||
static boolean
|
||||
emit_function_call(struct codegen *gen,
|
||||
const struct tgsi_full_instruction *inst,
|
||||
char *funcname, uint num_args)
|
||||
{
|
||||
const struct cell_spu_function_info *funcs = &gen->cell->spu_functions;
|
||||
char comment[100];
|
||||
uint addr;
|
||||
int ch;
|
||||
|
||||
assert(num_args <= 2);
|
||||
|
||||
/* lookup function address */
|
||||
{
|
||||
uint i;
|
||||
addr = 0;
|
||||
for (i = 0; i < funcs->num; i++) {
|
||||
if (strcmp(funcs->names[i], funcname) == 0) {
|
||||
addr = funcs->addrs[i];
|
||||
}
|
||||
}
|
||||
assert(addr && "spu function not found");
|
||||
}
|
||||
|
||||
sprintf(comment, "CALL %s:", funcname);
|
||||
spe_comment(gen->f, -4, comment);
|
||||
|
||||
for (ch = 0; ch < 4; ch++) {
|
||||
if (inst->FullDstRegisters[0].DstRegister.WriteMask & (1 << ch)) {
|
||||
int d_reg = get_dst_reg(gen, ch, &inst->FullDstRegisters[0]);
|
||||
int s_regs[3];
|
||||
uint a;
|
||||
for (a = 0; a < num_args; a++) {
|
||||
s_regs[a] = get_src_reg(gen, ch, &inst->FullSrcRegisters[a]);
|
||||
}
|
||||
|
||||
/* XXX not done */
|
||||
(void) s_regs;
|
||||
(void) d_reg;
|
||||
|
||||
spe_bisl(gen->f, SPE_REG_RA, addr, 0, 0); /* XXX untested! */
|
||||
|
||||
|
||||
store_dest_reg(gen, d_reg, ch, &inst->FullDstRegisters[0]);
|
||||
free_itemps(gen);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Emit max. See emit_SGT for comments.
|
||||
*/
|
||||
|
|
@ -1303,6 +1374,13 @@ emit_instruction(struct codegen *gen,
|
|||
case TGSI_OPCODE_END:
|
||||
return emit_END(gen);
|
||||
|
||||
case TGSI_OPCODE_COS:
|
||||
return emit_function_call(gen, inst, "spu_cos", 1);
|
||||
case TGSI_OPCODE_SIN:
|
||||
return emit_function_call(gen, inst, "spu_sin", 1);
|
||||
case TGSI_OPCODE_POW:
|
||||
return emit_function_call(gen, inst, "spu_pow", 2);
|
||||
|
||||
case TGSI_OPCODE_IF:
|
||||
return emit_IF(gen, inst);
|
||||
case TGSI_OPCODE_ELSE:
|
||||
|
|
@ -1431,6 +1509,7 @@ cell_gen_fragment_program(struct cell_context *cell,
|
|||
struct codegen gen;
|
||||
|
||||
memset(&gen, 0, sizeof(gen));
|
||||
gen.cell = cell;
|
||||
gen.f = f;
|
||||
|
||||
/* For SPE function calls: reg $3 = first param, $4 = second param, etc. */
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@
|
|||
#include "cell_spu.h"
|
||||
#include "pipe/p_format.h"
|
||||
#include "pipe/p_state.h"
|
||||
#include "util/u_memory.h"
|
||||
#include "cell/common.h"
|
||||
|
||||
|
||||
|
|
@ -131,6 +132,11 @@ cell_start_spus(struct cell_context *cell)
|
|||
ASSERT_ALIGN16(&cell_global.inits[0]);
|
||||
ASSERT_ALIGN16(&cell_global.inits[1]);
|
||||
|
||||
/*
|
||||
* Initialize the global 'inits' structure for each SPU.
|
||||
* A pointer to the init struct will be passed to each SPU.
|
||||
* The SPUs will then each grab their init info with mfc_get().
|
||||
*/
|
||||
for (i = 0; i < cell->num_spus; i++) {
|
||||
cell_global.inits[i].id = i;
|
||||
cell_global.inits[i].num_spus = cell->num_spus;
|
||||
|
|
@ -141,6 +147,8 @@ cell_start_spus(struct cell_context *cell)
|
|||
}
|
||||
cell_global.inits[i].buffer_status = &cell->buffer_status[0][0][0];
|
||||
|
||||
cell_global.inits[i].spu_functions = &cell->spu_functions;
|
||||
|
||||
cell_global.spe_contexts[i] = spe_context_create(0, NULL);
|
||||
if (!cell_global.spe_contexts[i]) {
|
||||
fprintf(stderr, "spe_context_create() failed\n");
|
||||
|
|
|
|||
|
|
@ -16,8 +16,9 @@ PROG_SPU_EMBED_O = $(PROG)_spu-embed.o
|
|||
|
||||
|
||||
SOURCES = \
|
||||
spu_main.c \
|
||||
spu_funcs.c \
|
||||
spu_dcache.c \
|
||||
spu_main.c \
|
||||
spu_per_fragment_op.c \
|
||||
spu_render.c \
|
||||
spu_texture.c \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,106 @@
|
|||
/**************************************************************************
|
||||
*
|
||||
* Copyright 2008 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.
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
/**
|
||||
* SPU functions accessed by shaders.
|
||||
*
|
||||
* Authors: Brian Paul
|
||||
*/
|
||||
|
||||
|
||||
#include <string.h>
|
||||
#include <libmisc.h>
|
||||
#include <cos8_v.h>
|
||||
#include <sin8_v.h>
|
||||
|
||||
#include "cell/common.h"
|
||||
#include "spu_main.h"
|
||||
#include "spu_funcs.h"
|
||||
|
||||
|
||||
#define M_PI 3.1415926
|
||||
|
||||
|
||||
static vector float
|
||||
spu_cos(vector float x)
|
||||
{
|
||||
static const float scale = 1.0 / (2.0 * M_PI);
|
||||
x = x * spu_splats(scale); /* normalize */
|
||||
return _cos8_v(x);
|
||||
}
|
||||
|
||||
static vector float
|
||||
spu_sin(vector float x)
|
||||
{
|
||||
static const float scale = 1.0 / (2.0 * M_PI);
|
||||
x = x * spu_splats(scale); /* normalize */
|
||||
return _sin8_v(x); /* 8-bit accuracy enough?? */
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
add_func(struct cell_spu_function_info *spu_functions,
|
||||
const char *name, void *addr)
|
||||
{
|
||||
uint n = spu_functions->num;
|
||||
ASSERT(strlen(name) < 16);
|
||||
strcpy(spu_functions->names[n], name);
|
||||
spu_functions->addrs[n] = (uint) addr;
|
||||
spu_functions->num++;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Return info about the SPU's function to the PPU / main memory.
|
||||
* The PPU needs to know the address of some SPU-side functions so
|
||||
* that we can generate shader code with function calls.
|
||||
*/
|
||||
void
|
||||
return_function_info(void)
|
||||
{
|
||||
struct cell_spu_function_info funcs ALIGN16_ATTRIB;
|
||||
int tag = TAG_MISC;
|
||||
|
||||
ASSERT(sizeof(funcs) == 256); /* must be multiple of 16 bytes */
|
||||
|
||||
funcs.num = 0;
|
||||
add_func(&funcs, "spu_cos", &spu_cos);
|
||||
add_func(&funcs, "spu_sin", &spu_sin);
|
||||
|
||||
/* Send the function info back to the PPU / main memory */
|
||||
mfc_put((void *) &funcs, /* src in local store */
|
||||
(unsigned int) spu.init.spu_functions, /* dst in main memory */
|
||||
sizeof(funcs), /* bytes */
|
||||
tag,
|
||||
0, /* tid */
|
||||
0 /* rid */);
|
||||
wait_on_mask(1 << tag);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
/**************************************************************************
|
||||
*
|
||||
* Copyright 2008 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 SPU_FUNCS_H
|
||||
#define SPU_FUNCS_H
|
||||
|
||||
extern void
|
||||
return_function_info(void);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
@ -32,6 +32,7 @@
|
|||
#include <stdio.h>
|
||||
#include <libmisc.h>
|
||||
|
||||
#include "spu_funcs.h"
|
||||
#include "spu_main.h"
|
||||
#include "spu_render.h"
|
||||
#include "spu_per_fragment_op.h"
|
||||
|
|
@ -721,6 +722,10 @@ main(main_param_t speid, main_param_t argp)
|
|||
0 /* rid */);
|
||||
wait_on_mask( 1 << tag );
|
||||
|
||||
if (spu.init.id == 0) {
|
||||
return_function_info();
|
||||
}
|
||||
|
||||
#if 0
|
||||
if (spu.init.id==0)
|
||||
spu_test_misc(spu.init.id);
|
||||
|
|
|
|||
Loading…
Reference in New Issue