Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/coreclr/jit/emitarm64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5921,7 +5921,7 @@ void emitter::emitIns_R_R_I(instruction ins,
}

// Try to optimize a load/store with an alternative instruction.
if (isLdrStr && m_compiler->opts.OptimizationEnabled() &&
if (isLdrStr && !insOptsIndexed(opt) && m_compiler->opts.OptimizationEnabled() &&
OptimizeLdrStr(ins, attr, reg1, reg2, imm, size, fmt, false, -1, -1 DEBUG_ARG(false)))
{
return;
Expand Down Expand Up @@ -17611,7 +17611,8 @@ bool emitter::OptimizeLdrStr(instruction ins,
{
assert(ins == INS_ldr || ins == INS_str);

if (!emitCanPeepholeLastIns() || (emitLastIns->idIns() != ins))
// A preceding writeback changes the base used by this access.
if (!emitCanPeepholeLastIns() || (emitLastIns->idIns() != ins) || insOptsIndexed(emitLastIns->idInsOpt()))
{
return false;
}
Expand Down
88 changes: 88 additions & 0 deletions src/tests/JIT/Regression_ro_2/Runtime_135522.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Xunit;

public class Runtime_135522
{
[StructLayout(LayoutKind.Sequential, Pack = 1)]
private struct Packed
{
public long Value;
public byte Padding;
}

[Theory]
[InlineData(1L, 3L)]
[InlineData(long.MinValue, long.MaxValue)]
public static void LoadAfterPostIndex(long first, long second)
Comment thread
AndyAyersMS marked this conversation as resolved.
Resolved
{
Packed[] values = new Packed[4];
values[0].Value = first;
values[2].Value = second;
Assert.Equal(first ^ second, LoadForward(values));
}

[Theory]
[InlineData(1L, 3L)]
[InlineData(long.MinValue, long.MaxValue)]
public static void LoadPairAfterPostIndex(long first, long second)
{
long[] values = { second, 11, 22, first, 33, 44, 55, 66 };
Assert.Equal(first ^ second, LoadBackward(values.AsSpan(3)));
}

[Theory]
[InlineData(1L, 3L)]
[InlineData(long.MinValue, long.MaxValue)]
public static void StorePairAfterPostIndex(long first, long second)
{
long[] values = { second, 11, 22, first, 33, 44, 55, 66 };
StoreBackward(values.AsSpan(3), second, first);
Assert.Equal(new long[] { first, 11, 22, second, 33, 44, 55, 66 }, values);
}

[MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.AggressiveOptimization)]
private static long LoadForward(Span<Packed> values)
{
if (values.Length < 4)
{
return 0;
}

long first = values[0].Value;
values = values.Slice(1);
long second = values[1].Value;
return first ^ second;
}

[MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.AggressiveOptimization)]
private static long LoadBackward(Span<long> values)
{
if (values.Length < 4)
{
return 0;
}

long first = values[0];
values = MemoryMarshal.CreateSpan(ref Unsafe.Subtract(ref MemoryMarshal.GetReference(values), 1), values.Length);
long second = Unsafe.Subtract(ref MemoryMarshal.GetReference(values), 2);
return first ^ second;
}

[MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.AggressiveOptimization)]
private static void StoreBackward(Span<long> values, long first, long second)
{
if (values.Length < 4)
{
return;
}

values[0] = first;
values = MemoryMarshal.CreateSpan(ref Unsafe.Subtract(ref MemoryMarshal.GetReference(values), 1), values.Length);
Unsafe.Subtract(ref MemoryMarshal.GetReference(values), 2) = second;
}
}
Loading