diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2012-05-17 13:41:21 -0400 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2012-05-17 14:48:10 -0400 |
| commit | d07473fcf4126c740802e6458452e82cc5c799ba (patch) | |
| tree | bdcd76f8d46c60cdb92d5b835f9ec070e1bf0eeb | |
| parent | 5187948bc2b16df70ee6696a8702a898b38a2d63 (diff) | |
radeon/llvm: Remove AMDIL MUL_IEEE* instructions
| -rw-r--r-- | src/gallium/drivers/radeon/AMDGPUGenInstrEnums.pl | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/AMDILInstructions.td | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/R600Instructions.td | 5 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/gallium/drivers/radeon/AMDGPUGenInstrEnums.pl b/src/gallium/drivers/radeon/AMDGPUGenInstrEnums.pl index 498ef13bae..df532eb94b 100644 --- a/src/gallium/drivers/radeon/AMDGPUGenInstrEnums.pl +++ b/src/gallium/drivers/radeon/AMDGPUGenInstrEnums.pl @@ -56,7 +56,7 @@ my $FILE_TYPE = $ARGV[0]; open AMDIL, '<', 'AMDILInstructions.td'; -my @INST_ENUMS = ('NONE', 'FEQ', 'FGE', 'FLT', 'FNE', 'MOVE_f32', 'MOVE_i32', 'FTOI', 'ITOF', 'UGT', 'IGE', 'INE', 'UGE', 'IEQ', 'BINARY_OR_i32', 'BINARY_NOT_i32', 'MIN_f32', 'MUL_IEEE_f32'); +my @INST_ENUMS = ('NONE', 'FEQ', 'FGE', 'FLT', 'FNE', 'MOVE_f32', 'MOVE_i32', 'FTOI', 'ITOF', 'UGT', 'IGE', 'INE', 'UGE', 'IEQ', 'BINARY_OR_i32', 'BINARY_NOT_i32', 'MIN_f32'); while (<AMDIL>) { if ($_ =~ /defm\s+([A-Z_]+)\s+:\s+([A-Za-z0-9]+)</) { diff --git a/src/gallium/drivers/radeon/AMDILInstructions.td b/src/gallium/drivers/radeon/AMDILInstructions.td index e512e265f5..725ac29d4b 100644 --- a/src/gallium/drivers/radeon/AMDILInstructions.td +++ b/src/gallium/drivers/radeon/AMDILInstructions.td @@ -213,9 +213,6 @@ def LUSHR : TwoInOneOut<IL_OP_U64_SHR, (outs GPRI64:$dst), //===---------------------------------------------------------------------===// // Generic Float Instructions //===---------------------------------------------------------------------===// -let hasIEEEFlag = 1 in { -defm MUL_IEEE : BinaryOpMCFloat<IL_OP_MUL_IEEE, IL_OP_D_MUL, fmul>; -} //===---------------------------------------------------------------------===// // float math instructions start here //===---------------------------------------------------------------------===// diff --git a/src/gallium/drivers/radeon/R600Instructions.td b/src/gallium/drivers/radeon/R600Instructions.td index c66d62d2be..75ccca235d 100644 --- a/src/gallium/drivers/radeon/R600Instructions.td +++ b/src/gallium/drivers/radeon/R600Instructions.td @@ -255,9 +255,8 @@ def MUL : R600_2OP < def MUL_IEEE : R600_2OP < 0x2, "MUL_IEEE", - [(set R600_Reg32:$dst, (fmul R600_Reg32:$src0, R600_Reg32:$src1))]> { - let AMDILOp = AMDILInst.MUL_IEEE_f32; -} + [(set R600_Reg32:$dst, (fmul R600_Reg32:$src0, R600_Reg32:$src1))] +>; def MAX : R600_2OP < 0x3, "MAX", |