Commit 75f4129b authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r328885: 

------------------------------------------------------------------------
r328885 | timshen | 2018-03-30 10:51:03 -0700 (Fri, 30 Mar 2018) | 14 lines

[NVPTX] Enable StructuredCFG for NVPTX

Summary:
Make NVPTX require structured CFG. Added a temporary flag to
"roll back" the behavior for easy deployment.

Combined with D45008, this fixes several internal Nvidia GPU test
failures that we suspect to be ptxas miscompiles (PR27738).

Reviewers: jlebar

Subscribers: jholewinski, sanjoy, llvm-commits, hiraditya

Differential Revision: https://reviews.llvm.org/D45070
------------------------------------------------------------------------

llvm-svn: 333475
parent f0350e65

llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp

+10 −0
Original line number Diff line number Diff line
@@ -44,6 +44,14 @@ static cl::opt<bool> 
                               cl::desc("Disable load/store vectorizer"),

                               cl::init(false), cl::Hidden);



// TODO: Remove this flag when we are confident with no regressions.

static cl::opt<bool> DisableRequireStructuredCFG(

    "disable-nvptx-require-structured-cfg",

    cl::desc("Transitional flag to turn off NVPTX's requirement on preserving "

             "structured CFG. The requirement should be disabled only when "

             "unexpected regressions happen."),

    cl::init(false), cl::Hidden);



namespace llvm {



void initializeNVVMIntrRangePass(PassRegistry&);
@@ -108,6 +116,8 @@ NVPTXTargetMachine::NVPTXTargetMachine(const Target &T, const Triple &TT, 
    drvInterface = NVPTX::NVCL;

  else

    drvInterface = NVPTX::CUDA;

  if (!DisableRequireStructuredCFG)

    setRequiresStructuredCFG(true);

  initAsmInfo();

}