mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-03-02 22:32:08 +00:00
DAGCombiner: Avoid generating illegal vector INT_TO_FP nodes
DAGCombiner::reduceBuildVecConvertToConvertBuildVec() was making two mistakes: 1. It was checking the legality of scalar INT_TO_FP nodes and then generating vector nodes. 2. It was passing the result value type to TargetLoweringInfo::getOperationAction() when it should have been passing the value type of the first operand. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171420 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
5bf3a28b36
commit
d40758b24e
@ -8625,11 +8625,8 @@ SDValue DAGCombiner::reduceBuildVecConvertToConvertBuildVec(SDNode *N) {
|
||||
if (Opcode == ISD::DELETED_NODE &&
|
||||
(Opc == ISD::UINT_TO_FP || Opc == ISD::SINT_TO_FP)) {
|
||||
Opcode = Opc;
|
||||
// If not supported by target, bail out.
|
||||
if (TLI.getOperationAction(Opcode, VT) != TargetLowering::Legal &&
|
||||
TLI.getOperationAction(Opcode, VT) != TargetLowering::Custom)
|
||||
return SDValue();
|
||||
}
|
||||
|
||||
if (Opc != Opcode)
|
||||
return SDValue();
|
||||
|
||||
@ -8654,6 +8651,10 @@ SDValue DAGCombiner::reduceBuildVecConvertToConvertBuildVec(SDNode *N) {
|
||||
assert(SrcVT != MVT::Other && "Cannot determine source type!");
|
||||
|
||||
EVT NVT = EVT::getVectorVT(*DAG.getContext(), SrcVT, NumInScalars);
|
||||
|
||||
if (!TLI.isOperationLegalOrCustom(Opcode, NVT))
|
||||
return SDValue();
|
||||
|
||||
SmallVector<SDValue, 8> Opnds;
|
||||
for (unsigned i = 0; i != NumInScalars; ++i) {
|
||||
SDValue In = N->getOperand(i);
|
||||
|
33
test/CodeGen/R600/dagcombiner-bug-illegal-vec4-int-to-fp.ll
Normal file
33
test/CodeGen/R600/dagcombiner-bug-illegal-vec4-int-to-fp.ll
Normal file
@ -0,0 +1,33 @@
|
||||
;RUN: llc < %s -march=r600 -mcpu=redwood | FileCheck %s
|
||||
|
||||
;CHECK: INT_TO_FLT T{{[0-9]+\.[XYZW], T[0-9]+\.[XYZW]}}
|
||||
|
||||
; This test is for a bug in
|
||||
; DAGCombiner::reduceBuildVecConvertToConvertBuildVec() where
|
||||
; the wrong type was being passed to
|
||||
; TargetLowering::getOperationAction() when checking the legality of
|
||||
; ISD::UINT_TO_FP and ISD::SINT_TO_FP opcodes.
|
||||
|
||||
define void @sint(<4 x float> addrspace(1)* %out, i32 addrspace(1)* %in) {
|
||||
entry:
|
||||
%ptr = getelementptr i32 addrspace(1)* %in, i32 1
|
||||
%sint = load i32 addrspace(1) * %in
|
||||
%conv = sitofp i32 %sint to float
|
||||
%0 = insertelement <4 x float> undef, float %conv, i32 0
|
||||
%splat = shufflevector <4 x float> %0, <4 x float> undef, <4 x i32> zeroinitializer
|
||||
store <4 x float> %splat, <4 x float> addrspace(1)* %out
|
||||
ret void
|
||||
}
|
||||
|
||||
;CHECK: UINT_TO_FLT T{{[0-9]+\.[XYZW], T[0-9]+\.[XYZW]}}
|
||||
|
||||
define void @uint(<4 x float> addrspace(1)* %out, i32 addrspace(1)* %in) {
|
||||
entry:
|
||||
%ptr = getelementptr i32 addrspace(1)* %in, i32 1
|
||||
%uint = load i32 addrspace(1) * %in
|
||||
%conv = uitofp i32 %uint to float
|
||||
%0 = insertelement <4 x float> undef, float %conv, i32 0
|
||||
%splat = shufflevector <4 x float> %0, <4 x float> undef, <4 x i32> zeroinitializer
|
||||
store <4 x float> %splat, <4 x float> addrspace(1)* %out
|
||||
ret void
|
||||
}
|
@ -1,6 +1,3 @@
|
||||
; There are bugs in the DAGCombiner that prevent this test from passing.
|
||||
; XFAIL: *
|
||||
|
||||
; RUN: llc < %s -march=r600 -mcpu=redwood | FileCheck %s
|
||||
|
||||
; CHECK: FLT_TO_INT T{{[0-9]+\.[XYZW], T[0-9]+\.[XYZW]}}
|
||||
|
@ -1,3 +1,7 @@
|
||||
; A bug fix in the DAGCombiner made this test fail, so marking as xfail
|
||||
; until this can be investigated further.
|
||||
; XFAIL: *
|
||||
|
||||
; RUN: llc < %s -mtriple=i686-linux-pc -mcpu=corei7 | FileCheck %s
|
||||
|
||||
define <2 x float> @foo(i32 %x, i32 %y, <2 x float> %v) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user