Skip to content

Commit

Permalink
DAG: Prevent store value forwarding to distinct addrspace load
Browse files Browse the repository at this point in the history
DAGCombiner replaces (load const_addr1) directly chained with (store
(val, const_addr2)) with val if address space stripped const_addr1 ==
const_addr2. The patch fixes the issue by checking address spaces as
well.  However, it might makes sense to not to chain together side
effects that belong to different address spaces in the first place and
make SelectionDAG::root address space aware.
  • Loading branch information
akiramenai authored and arsenm committed Dec 29, 2022
1 parent e50976e commit 0ec51a4
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
Expand Up @@ -17113,7 +17113,7 @@ SDValue DAGCombiner::ForwardStoreValueToDirectLoad(LoadSDNode *LD) {
SDValue Chain = LD->getOperand(0);
StoreSDNode *ST = dyn_cast<StoreSDNode>(Chain.getNode());
// TODO: Relax this restriction for unordered atomics (see D66309)
if (!ST || !ST->isSimple())
if (!ST || !ST->isSimple() || ST->getAddressSpace() != LD->getAddressSpace())
return SDValue();

EVT LDType = LD->getValueType(0);
Expand Down
21 changes: 21 additions & 0 deletions llvm/test/CodeGen/NVPTX/chain-different-as.ll
@@ -0,0 +1,21 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc -mtriple=nvptx64 < %s | FileCheck %s

define i64 @test() nounwind readnone {
; CHECK-LABEL: test(
; CHECK: {
; CHECK-NEXT: .reg .b64 %rd<4>;
; CHECK-EMPTY:
; CHECK-NEXT: // %bb.0:
; CHECK-NEXT: mov.u64 %rd1, 1;
; CHECK-NEXT: mov.u64 %rd2, 42;
; CHECK-NEXT: st.u64 [%rd1], %rd2;
; CHECK-NEXT: ld.global.u64 %rd3, [%rd1];
; CHECK-NEXT: st.param.b64 [func_retval0+0], %rd3;
; CHECK-NEXT: ret;
%addr0 = inttoptr i64 1 to ptr
%addr1 = inttoptr i64 1 to ptr addrspace(1)
store i64 42, ptr %addr0
%res = load i64, ptr addrspace(1) %addr1
ret i64 %res
}

0 comments on commit 0ec51a4

Please sign in to comment.