[PATCH] D54265: [DAGCombiner] Fix load-store forwarding of indexed loads.
Nirav Dave via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 8 08:41:14 PST 2018
niravd created this revision.
niravd added reviewers: peter.smith, rengolin.
Herald added subscribers: arphaman, hiraditya, javed.absar.
Handle extra output from index loads in cases where we wish to
forward a load value directly from a preceeding store.
Fixes PR39571.
Repository:
rL LLVM
https://reviews.llvm.org/D54265
Files:
llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
llvm/test/CodeGen/ARM/pr39571.ll
Index: llvm/test/CodeGen/ARM/pr39571.ll
===================================================================
--- /dev/null
+++ llvm/test/CodeGen/ARM/pr39571.ll
@@ -0,0 +1,37 @@
+; RUN: llc < %s -mtriple armv4t-unknown-linux-gnueabi -mattr=+strict-align
+
+; Avoid crash from forwarding indexed-loads back to store.
+
+
+%struct.anon = type { %struct.mwifiex_adapter*, %struct.mwifiex_current_bss_params }
+%struct.mwifiex_adapter = type { i8 }
+%struct.mwifiex_current_bss_params = type { %struct.mwifiex_bssdescriptor, i8 }
+%struct.mwifiex_bssdescriptor = type {}
+%struct.anon.0 = type { %struct.anon.1 }
+%struct.anon.1 = type { %struct.host_cmd_ds_802_11_ad_hoc_start }
+%struct.host_cmd_ds_802_11_ad_hoc_start = type <{ i8, %union.ieee_types_ss_param_set }>
+%union.ieee_types_ss_param_set = type { %struct.ieee_types_ibss_param_set }
+%struct.ieee_types_ibss_param_set = type { i8, i8, i16 }
+
+ at a = common dso_local local_unnamed_addr global %struct.anon* null, align 4
+ at b = common dso_local local_unnamed_addr global %struct.anon.0 zeroinitializer, align 1
+
+; Function Attrs: norecurse nounwind
+define dso_local void @mwifiex_cmd_802_11_ad_hoc_start() local_unnamed_addr {
+entry:
+ %0 = load %struct.anon*, %struct.anon** @a, align 4
+ %adapter = getelementptr inbounds %struct.anon, %struct.anon* %0, i32 0, i32 0
+ %1 = load %struct.mwifiex_adapter*, %struct.mwifiex_adapter** %adapter, align 4
+ %c.sroa.0.0..sroa_idx = getelementptr inbounds %struct.mwifiex_adapter, %struct.mwifiex_adapter* %1, i32 0, i32 0
+ %c.sroa.0.0.copyload = load i8, i8* %c.sroa.0.0..sroa_idx, align 1
+ %curr_bss_params = getelementptr inbounds %struct.anon, %struct.anon* %0, i32 0, i32 1
+ %band = getelementptr inbounds %struct.anon, %struct.anon* %0, i32 0, i32 1, i32 1
+ store i8 %c.sroa.0.0.copyload, i8* %band, align 4
+ store i8 6, i8* getelementptr inbounds (%struct.anon.0, %struct.anon.0* @b, i32 0, i32 0, i32 0, i32 1, i32 0, i32 0), align 1
+ store i8 2, i8* getelementptr inbounds (%struct.anon.0, %struct.anon.0* @b, i32 0, i32 0, i32 0, i32 1, i32 0, i32 1), align 1
+ %2 = bitcast %struct.mwifiex_current_bss_params* %curr_bss_params to i32*
+ %3 = load i32, i32* bitcast (i8* getelementptr inbounds (%struct.anon.0, %struct.anon.0* @b, i32 0, i32 0, i32 0, i32 1, i32 0, i32 0) to i32*), align 1
+ store i32 %3, i32* %2, align 1
+ ret void
+}
+
Index: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
===================================================================
--- llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -12861,14 +12861,28 @@
bool STCoversLD =
(Offset >= 0) &&
(Offset * 8 + LDMemType.getSizeInBits() <= STMemType.getSizeInBits());
+
+ auto ReplaceLd = [&](LoadSDNode *LD, SDValue Val, SDValue Chain) -> SDValue {
+ if (LD->isIndexed()) {
+ auto IsSub = (LD->getAddressingMode() == ISD::PRE_DEC ||
+ LD->getAddressingMode() == ISD::POST_DEC);
+ auto Opc = IsSub ? ISD::SUB : ISD::ADD;
+ auto Idx = DAG.getNode(Opc, SDLoc(LD), LD->getOperand(1).getValueType(),
+ LD->getOperand(1), LD->getOperand(2));
+ SDValue Ops[] = {Val, Idx, Chain};
+ return CombineTo(LD, Ops, 3);
+ }
+ return CombineTo(LD, Val, Chain);
+ };
+
if (!STCoversLD)
return SDValue();
// Memory as copy space (potentially masked).
if (Offset == 0 && LDType == STType && STMemType == LDMemType) {
// Simple case: Direct non-truncating forwarding
if (LDType.getSizeInBits() == LDMemType.getSizeInBits())
- return CombineTo(LD, ST->getValue(), Chain);
+ return ReplaceLd(LD, ST->getValue(), Chain);
// Can we model the truncate and extension with an and mask?
if (STType.isInteger() && LDMemType.isInteger() && !STType.isVector() &&
!LDMemType.isVector() && LD->getExtensionType() != ISD::SEXTLOAD) {
@@ -12878,7 +12892,7 @@
STMemType.getSizeInBits()),
SDLoc(ST), STType);
auto Val = DAG.getNode(ISD::AND, SDLoc(LD), LDType, ST->getValue(), Mask);
- return CombineTo(LD, Val, Chain);
+ return ReplaceLd(LD, Val, Chain);
}
}
@@ -12903,7 +12917,7 @@
}
if (!extendLoadedValueToExtension(LD, Val))
continue;
- return CombineTo(LD, Val, Chain);
+ return ReplaceLd(LD, Val, Chain);
} while (false);
// On failure, cleanup dead nodes we may have created.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D54265.173171.patch
Type: text/x-patch
Size: 4494 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181108/ae79d43e/attachment.bin>
More information about the llvm-commits
mailing list