This is an archive of the discontinued LLVM Phabricator instance.

Differential D5235

R600/SI: Fix assertion from copying a TargetGlobalAddress
ClosedPublic

Authored by arsenm on Sep 7 2014, 1:07 PM.

Details

Reviewers
arsenm
Summary

Assert in scheduler from an inserted copy_to_regclass from
a constant.




This only seems to break sometimes when a constant initializer

address is forced into VGPRs in a non-entry block. No test

since the only case I've managed to hit only happens with a future

patch, and that case will also not be a problem once SGPRs are

used in non-entry blocks.
Diff Detail
Event Timeline
arsenm updated this revision to Diff 13377.Sep 7 2014, 1:07 PM
arsenm retitled this revision from  to R600/SI: Fix assertion from copying a TargetGlobalAddress
.
arsenm updated this object.
arsenm edited the test plan for this revision. (Show Details)
arsenm added a subscriber: Unknown Object (MLST).
arsenm accepted this revision.Sep 8 2014, 8:17 AM
arsenm added a reviewer: arsenm.
r217380
This revision is now accepted and ready to land.Sep 8 2014, 8:17 AM
arsenm closed this revision.Sep 8 2014, 8:17 AM
Revision Contents
PathSize
lib/
Target/
R600/
3 lines
Diff 13377
lib/Target/R600/SIISelLowering.cpp
Context not available.



  SDNode *Node;
  SDNode *Node;

  // We can't use COPY_TO_REGCLASS with FrameIndex arguments.
  // We can't use COPY_TO_REGCLASS with FrameIndex arguments.

  if (isa<FrameIndexSDNode>(Operand)) {
  if (isa<FrameIndexSDNode>(Operand) ||

      isa<GlobalAddressSDNode>(Operand)) {

    unsigned Opcode = Operand.getValueType() == MVT::i32 ?
    unsigned Opcode = Operand.getValueType() == MVT::i32 ?

                      AMDGPU::S_MOV_B32 : AMDGPU::S_MOV_B64;
                      AMDGPU::S_MOV_B32 : AMDGPU::S_MOV_B64;

    Node = DAG.getMachineNode(Opcode, SDLoc(), Operand.getValueType(),
    Node = DAG.getMachineNode(Opcode, SDLoc(), Operand.getValueType(),

Context not available.