diff options
| author | Justin Lebar <jlebar@google.com> | 2016-08-19 20:46:45 +0000 |
|---|---|---|
| committer | Justin Lebar <jlebar@google.com> | 2016-08-19 20:46:45 +0000 |
| commit | d13880a75011b20ffd4b011643901865b494da22 (patch) | |
| tree | 4a07a2be11b7faad23303dd85806925d658ee7d3 | |
| parent | b03a71eea815e20bfa0c9dd0833ce8d1ebff3f62 (diff) | |
| download | bcm5719-llvm-d13880a75011b20ffd4b011643901865b494da22.tar.gz bcm5719-llvm-d13880a75011b20ffd4b011643901865b494da22.zip | |
[NVPTX] Switch nvptx-use-infer-addrspace to true.
Summary:
This switches us to use a different, more powerful algorithm for address
space inference. I've tested this locally and it seems to work great.
Once we're more confident in it, we can remove the old pass altogether.
Reviewers: jingyue
Subscribers: llvm-commits, tra, jholewinski
Differential Revision: https://reviews.llvm.org/D23694
llvm-svn: 279317
| -rw-r--r-- | llvm/lib/Target/NVPTX/NVPTXInferAddressSpaces.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/CodeGen/NVPTX/access-non-generic.ll | 3 | ||||
| -rw-r--r-- | llvm/test/CodeGen/NVPTX/addrspacecast.ll | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/llvm/lib/Target/NVPTX/NVPTXInferAddressSpaces.cpp b/llvm/lib/Target/NVPTX/NVPTXInferAddressSpaces.cpp index e451d273cf4..f4940c937a2 100644 --- a/llvm/lib/Target/NVPTX/NVPTXInferAddressSpaces.cpp +++ b/llvm/lib/Target/NVPTX/NVPTXInferAddressSpaces.cpp @@ -87,9 +87,6 @@ // Finally, it fixes the undef in %y' so that // %y' = phi float addrspace(3)* [ %input, %y2' ] // -// TODO: This pass is experimental and not enabled by default. Users can turn it -// on by setting the -nvptx-use-infer-addrspace flag of llc. We plan to replace -// NVPTXNonFavorGenericAddrSpaces with this pass shortly. //===----------------------------------------------------------------------===// #define DEBUG_TYPE "nvptx-infer-addrspace" diff --git a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp index d83154aa46d..d95b42afe35 100644 --- a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp +++ b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp @@ -51,7 +51,7 @@ using namespace llvm; static cl::opt<bool> UseInferAddressSpaces( - "nvptx-use-infer-addrspace", cl::init(false), cl::Hidden, + "nvptx-use-infer-addrspace", cl::init(true), cl::Hidden, cl::desc("Optimize address spaces using NVPTXInferAddressSpaces instead of " "NVPTXFavorNonGenericAddrSpaces")); diff --git a/llvm/test/CodeGen/NVPTX/access-non-generic.ll b/llvm/test/CodeGen/NVPTX/access-non-generic.ll index 3cd5a922508..773273cff36 100644 --- a/llvm/test/CodeGen/NVPTX/access-non-generic.ll +++ b/llvm/test/CodeGen/NVPTX/access-non-generic.ll @@ -1,6 +1,7 @@ ; RUN: llc < %s -march=nvptx -mcpu=sm_20 | FileCheck %s --check-prefix PTX ; RUN: llc < %s -march=nvptx64 -mcpu=sm_20 | FileCheck %s --check-prefix PTX -; RUN: llc < %s -march=nvptx64 -mcpu=sm_20 -nvptx-use-infer-addrspace | FileCheck %s --check-prefix PTX +; RUN: llc < %s -march=nvptx64 -mcpu=sm_20 -nvptx-use-infer-addrspace=true | FileCheck %s --check-prefix PTX +; RUN: llc < %s -march=nvptx64 -mcpu=sm_20 -nvptx-use-infer-addrspace=false | FileCheck %s --check-prefix PTX ; RUN: opt < %s -S -nvptx-favor-non-generic -dce | FileCheck %s --check-prefix IR ; RUN: opt < %s -S -nvptx-infer-addrspace | FileCheck %s --check-prefix IR --check-prefix IR-WITH-LOOP diff --git a/llvm/test/CodeGen/NVPTX/addrspacecast.ll b/llvm/test/CodeGen/NVPTX/addrspacecast.ll index 42e67ca8ce9..f3e5a40cdf2 100644 --- a/llvm/test/CodeGen/NVPTX/addrspacecast.ll +++ b/llvm/test/CodeGen/NVPTX/addrspacecast.ll @@ -1,5 +1,7 @@ -; RUN: llc < %s -march=nvptx -mcpu=sm_20 -disable-nvptx-favor-non-generic | FileCheck %s -check-prefix=PTX32 -; RUN: llc < %s -march=nvptx64 -mcpu=sm_20 -disable-nvptx-favor-non-generic | FileCheck %s -check-prefix=PTX64 +; RUN: llc < %s -march=nvptx -mcpu=sm_20 -disable-nvptx-favor-non-generic \ +; RUN: -nvptx-use-infer-addrspace=false | FileCheck %s -check-prefix=PTX32 +; RUN: llc < %s -march=nvptx64 -mcpu=sm_20 -disable-nvptx-favor-non-generic \ +; RUN: -nvptx-use-infer-addrspace=false | FileCheck %s -check-prefix=PTX64 define i32 @conv1(i32 addrspace(1)* %ptr) { |
