fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 09:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

llvm: implement sub and abs

Browse source
This commit is contained in:
Zack Rusin 2008-05-15 17:46:20 -04:00
parent 735752e8dc
commit 59766ac273
5 changed files with 67 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/auxiliary/gallivm/gallivm.cpp
View file

@ -303,11 +303,11 @@ struct gallivm_prog * gallivm_ir_compile(struct gallivm_ir *ir)
{
struct gallivm_prog *prog =
(struct gallivm_prog *)calloc(1, sizeof(struct gallivm_prog));
std::cout << "Before optimizations:"<<std::endl;
ir->module->dump();
std::cout<<"-------------------------------"<<std::endl;
PassManager veri;
veri.add(createVerifierPass());
veri.run(*ir->module);
@ -315,7 +315,7 @@ struct gallivm_prog * gallivm_ir_compile(struct gallivm_ir *ir)
prog->num_consts = ir->num_consts;
memcpy(prog->interpolators, ir->interpolators, sizeof(prog->interpolators));
prog->num_interp = ir->num_interp;
/* Run optimization passes over it */
PassManager passes;
passes.add(new TargetData(mod));

35
src/gallium/auxiliary/gallivm/instructionssoa.cpp
View file

@ -173,6 +173,7 @@ std::vector<llvm::Value*> InstructionsSoa::extractVector(llvm::Value *vector)
void InstructionsSoa::createFunctionMap()
{
m_functionsMap[TGSI_OPCODE_ABS] = "abs";
m_functionsMap[TGSI_OPCODE_DP3] = "dp3";
m_functionsMap[TGSI_OPCODE_DP4] = "dp4";
m_functionsMap[TGSI_OPCODE_POWER] = "pow";
@ -180,9 +181,16 @@ void InstructionsSoa::createFunctionMap()
void InstructionsSoa::createDependencies()
{
std::vector<std::string> powDeps(1);
powDeps[0] = "powf";
m_builtinDependencies["pow"] = powDeps;
{
std::vector<std::string> powDeps(1);
powDeps[0] = "powf";
m_builtinDependencies["pow"] = powDeps;
}
{
std::vector<std::string> absDeps(1);
absDeps[0] = "fabsf";
m_builtinDependencies["abs"] = absDeps;
}
}
llvm::Function * InstructionsSoa::function(int op)
@ -226,6 +234,13 @@ void InstructionsSoa::createBuiltins()
createDependencies();
}
std::vector<llvm::Value*> InstructionsSoa::abs(const std::vector<llvm::Value*> in1)
{
llvm::Function *func = function(TGSI_OPCODE_ABS);
return callBuiltin(func, in1);
}
std::vector<llvm::Value*> InstructionsSoa::dp3(const std::vector<llvm::Value*> in1,
const std::vector<llvm::Value*> in2)
{
@ -418,3 +433,17 @@ void InstructionsSoa::injectFunction(llvm::Function *originalFunc, int op)
m_functions[op] = func;
}
}
std::vector<llvm::Value*> InstructionsSoa::sub(const std::vector<llvm::Value*> in1,
const std::vector<llvm::Value*> in2)
{
std::vector<llvm::Value*> res(4);
res[0] = m_builder.CreateSub(in1[0], in2[0], name("subx"));
res[1] = m_builder.CreateSub(in1[1], in2[1], name("suby"));
res[2] = m_builder.CreateSub(in1[2], in2[2], name("subz"));
res[3] = m_builder.CreateSub(in1[3], in2[3], name("subw"));
return res;
}

3
src/gallium/auxiliary/gallivm/instructionssoa.h
View file

@ -48,6 +48,7 @@ public:
InstructionsSoa(llvm::Module *mod, llvm::Function *func,
llvm::BasicBlock *block, StorageSoa *storage);
std::vector<llvm::Value*> abs(const std::vector<llvm::Value*> in1);
std::vector<llvm::Value*> arl(const std::vector<llvm::Value*> in);
std::vector<llvm::Value*> add(const std::vector<llvm::Value*> in1,
const std::vector<llvm::Value*> in2);
@ -62,6 +63,8 @@ public:
const std::vector<llvm::Value*> in2);
std::vector<llvm::Value*> pow(const std::vector<llvm::Value*> in1,
const std::vector<llvm::Value*> in2);
std::vector<llvm::Value*> sub(const std::vector<llvm::Value*> in1,
const std::vector<llvm::Value*> in2);
void end();
std::vector<llvm::Value*> extractVector(llvm::Value *vector);

38
src/gallium/auxiliary/gallivm/soabuiltins.c
View file

@ -33,6 +33,33 @@
*/
typedef __attribute__(( ext_vector_type(4) )) float float4;
extern float fabsf(float val);
void abs(float4 *res,
float4 tmp0x, float4 tmp0y, float4 tmp0z, float4 tmp0w)
{
res[0].x = fabsf(tmp0x.x);
res[0].y = fabsf(tmp0x.y);
res[0].z = fabsf(tmp0x.z);
res[0].w = fabsf(tmp0x.w);
res[1].x = fabsf(tmp0y.x);
res[1].y = fabsf(tmp0y.y);
res[1].z = fabsf(tmp0y.z);
res[1].w = fabsf(tmp0y.w);
res[2].x = fabsf(tmp0z.x);
res[2].y = fabsf(tmp0z.y);
res[2].z = fabsf(tmp0z.z);
res[2].w = fabsf(tmp0z.w);
res[3].x = fabsf(tmp0w.x);
res[3].y = fabsf(tmp0w.y);
res[3].z = fabsf(tmp0w.z);
res[3].w = fabsf(tmp0w.w);
}
void dp3(float4 *res,
float4 tmp0x, float4 tmp0y, float4 tmp0z, float4 tmp0w,
float4 tmp1x, float4 tmp1y, float4 tmp1z, float4 tmp1w)
@ -77,14 +104,3 @@ void pow(float4 *res,
res[2] = p;
res[3] = p;
}
#if 0
void yo(float4 *out, float4 *in)
{
float4 res[4];
dp3(res, in[0], in[1], in[2], in[3],
in[4], in[5], in[6], in[7]);
out[1] = res[1];
}
#endif

2
src/gallium/auxiliary/gallivm/tgsitollvm.cpp
View file

@ -740,6 +740,7 @@ translate_instructionir(llvm::Module *module,
}
break;
case TGSI_OPCODE_SUB: {
out = instr->sub(inputs[0], inputs[1]);
}
break;
case TGSI_OPCODE_LERP: {
@ -781,6 +782,7 @@ translate_instructionir(llvm::Module *module,
case TGSI_OPCODE_MULTIPLYMATRIX:
break;
case TGSI_OPCODE_ABS: {
out = instr->abs(inputs[0]);
}
break;
case TGSI_OPCODE_RCC: