Skip to content

[JIT] ARM64 - Temporary fix for ldp/stp optimizations#90534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TIHan merged 5 commits into from
Aug 16, 2023
Merged

[JIT] ARM64 - Temporary fix for ldp/stp optimizations #90534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db3fa7e
Added regression test 85765
TIHan Aug 14, 2023
eaa5ac9
Mark M4 as NoInlining
TIHan Aug 14, 2023
782d7a2
Check current and last ins format to determine whether to proceed wit…
TIHan Aug 15, 2023
d62c69b
Additional test
TIHan Aug 15, 2023
8cebc50
Feedback
TIHan Aug 15, 2023
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
9 changes: 9 additions & 0 deletions src/coreclr/jit/emitarm64.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16615,6 +16615,15 @@ emitter::RegisterOrder emitter::IsOptimizableLdrStrWithPair(
emitAttr prevSize = emitLastIns->idOpSize();
ssize_t prevImm = emitGetInsSC(emitLastIns);

// If we have this format, the 'imm' and/or 'prevImm' are not scaled(encoded),
// therefore we cannot proceed.
// TODO: In this context, 'imm' and 'prevImm' are assumed to be scaled(encoded).
// They should never be scaled(encoded) until its about to be written to the buffer.
if (fmt == IF_LS_2C || lastInsFmt == IF_LS_2C)
{
return eRO_none;
}

// Signed, *raw* immediate value fits in 7 bits, so for LDP/ STP the raw value is from -64 to +63.
// For LDR/ STR, there are 9 bits, so we need to limit the range explicitly in software.
if ((imm < -64) || (imm > 63) || (prevImm < -64) || (prevImm > 63))
Expand Down
63 changes: 63 additions & 0 deletions src/tests/JIT/Regression/JitBlue/Runtime_85765/Runtime_85765.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// 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 Xunit;

public class Runtime_85765
{
public struct S0
{
public S0(bool f1): this()
{
}
}

public struct S1
{
public byte F0;
public bool F1;
public bool F2;
}

[Fact]
public static void Test()
{
S1 vr2 = M4();
vr2.F2 |= vr2.F1;
Assert.False(Consume(vr2.F2));
}

[MethodImpl(MethodImplOptions.NoInlining)]
public static S1 M4()
{
S1 var1 = default(S1);
var vr0 = new S0(false);
return var1;
}

[MethodImpl(MethodImplOptions.NoInlining)]
private static bool Consume(bool value)
{
return value;
}

// ------

[Fact]
public static void Test2()
{
byte* bytes = stackalloc byte[1024];
bytes[0x1A] = 1;
bytes[0x1B] = 2;
int sum = Foo(bytes);
Assert.True(sum == 515);
}

[MethodImpl(MethodImplOptions.NoInlining)]
public static int Foo(byte* b)
{
return Unsafe.ReadUnaligned<int>(ref b[0x1A]) + Unsafe.ReadUnaligned<int>(ref b[0x1B]);
}
}
8 changes: 8 additions & 0 deletions src/tests/JIT/Regression/JitBlue/Runtime_85765/Runtime_85765.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Optimize>True</Optimize>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).cs" />
</ItemGroup>
</Project>
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[JIT] ARM64 - Temporary fix for `ldp`/`stp` optimizations by TIHan · Pull Request #90534 · dotnet/runtime · GitHub
Skip to content
[JIT] ARM64 - Temporary fix for ldp/stp optimizations#90534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TIHan
merged 5 commits into

from

Aug 16, 2023
 Merged


[JIT] ARM64 - Temporary fix for ldp/stp optimizations
#90534
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
db3fa7e

Added regression test 85765


TIHan Aug 14, 2023
eaa5ac9

Mark M4 as NoInlining


TIHan Aug 14, 2023
782d7a2

Check current and last ins format to determine whether to proceed wit…


TIHan Aug 15, 2023
d62c69b

Additional test


TIHan Aug 15, 2023
8cebc50

Feedback


TIHan Aug 15, 2023

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


9 changes: 9 additions & 0 deletions
src/coreclr/jit/emitarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16615,6 +16615,15 @@ emitter::RegisterOrder emitter::IsOptimizableLdrStrWithPair(
 emitAttr prevSize = emitLastIns->idOpSize();
 ssize_t prevImm = emitGetInsSC(emitLastIns);

 // If we have this format, the 'imm' and/or 'prevImm' are not scaled(encoded),
 // therefore we cannot proceed.
 // TODO: In this context, 'imm' and 'prevImm' are assumed to be scaled(encoded).
 // They should never be scaled(encoded) until its about to be written to the buffer.
 if (fmt == IF_LS_2C || lastInsFmt == IF_LS_2C)
 {
 return eRO_none;
 }

 // Signed, *raw* immediate value fits in 7 bits, so for LDP/ STP the raw value is from -64 to +63.
 // For LDR/ STR, there are 9 bits, so we need to limit the range explicitly in software.
 if ((imm < -64) || (imm > 63) || (prevImm < -64) || (prevImm > 63))
Expand Down

63 changes: 63 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_85765/Runtime_85765.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// 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 Xunit;

public class Runtime_85765
{
 public struct S0
 {
 public S0(bool f1): this()
 {
 }
 }

 public struct S1
 {
 public byte F0;
 public bool F1;
 public bool F2;
 }

 [Fact]
 public static void Test()
 {
 S1 vr2 = M4();
 vr2.F2 |= vr2.F1;
 Assert.False(Consume(vr2.F2));
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 public static S1 M4()
 {
 S1 var1 = default(S1);
 var vr0 = new S0(false);
 return var1;
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 private static bool Consume(bool value)
 {
 return value;
 }

 // ------

 [Fact]
 public static void Test2()
 {
 byte* bytes = stackalloc byte[1024];
 bytes[0x1A] = 1;
 bytes[0x1B] = 2;
 int sum = Foo(bytes);
 Assert.True(sum == 515);
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 public static int Foo(byte* b)
 {
 return Unsafe.ReadUnaligned<int>(ref b[0x1A]) + Unsafe.ReadUnaligned<int>(ref b[0x1B]);
 }
}

8 changes: 8 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_85765/Runtime_85765.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <Optimize>True</Optimize>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[JIT] ARM64 - Temporary fix for `ldp`/`stp` optimizations by TIHan · Pull Request #90534 · dotnet/runtime · GitHub
Skip to content
[JIT] ARM64 - Temporary fix for ldp/stp optimizations#90534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TIHan
merged 5 commits into

from

Aug 16, 2023
 Merged


[JIT] ARM64 - Temporary fix for ldp/stp optimizations
#90534
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
db3fa7e

Added regression test 85765


TIHan Aug 14, 2023
eaa5ac9

Mark M4 as NoInlining


TIHan Aug 14, 2023
782d7a2

Check current and last ins format to determine whether to proceed wit…


TIHan Aug 15, 2023
d62c69b

Additional test


TIHan Aug 15, 2023
8cebc50

Feedback


TIHan Aug 15, 2023

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


9 changes: 9 additions & 0 deletions
src/coreclr/jit/emitarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16615,6 +16615,15 @@ emitter::RegisterOrder emitter::IsOptimizableLdrStrWithPair(
 emitAttr prevSize = emitLastIns->idOpSize();
 ssize_t prevImm = emitGetInsSC(emitLastIns);

 // If we have this format, the 'imm' and/or 'prevImm' are not scaled(encoded),
 // therefore we cannot proceed.
 // TODO: In this context, 'imm' and 'prevImm' are assumed to be scaled(encoded).
 // They should never be scaled(encoded) until its about to be written to the buffer.
 if (fmt == IF_LS_2C || lastInsFmt == IF_LS_2C)
 {
 return eRO_none;
 }

 // Signed, *raw* immediate value fits in 7 bits, so for LDP/ STP the raw value is from -64 to +63.
 // For LDR/ STR, there are 9 bits, so we need to limit the range explicitly in software.
 if ((imm < -64) || (imm > 63) || (prevImm < -64) || (prevImm > 63))
Expand Down

63 changes: 63 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_85765/Runtime_85765.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// 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 Xunit;

public class Runtime_85765
{
 public struct S0
 {
 public S0(bool f1): this()
 {
 }
 }

 public struct S1
 {
 public byte F0;
 public bool F1;
 public bool F2;
 }

 [Fact]
 public static void Test()
 {
 S1 vr2 = M4();
 vr2.F2 |= vr2.F1;
 Assert.False(Consume(vr2.F2));
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 public static S1 M4()
 {
 S1 var1 = default(S1);
 var vr0 = new S0(false);
 return var1;
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 private static bool Consume(bool value)
 {
 return value;
 }

 // ------

 [Fact]
 public static void Test2()
 {
 byte* bytes = stackalloc byte[1024];
 bytes[0x1A] = 1;
 bytes[0x1B] = 2;
 int sum = Foo(bytes);
 Assert.True(sum == 515);
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 public static int Foo(byte* b)
 {
 return Unsafe.ReadUnaligned<int>(ref b[0x1A]) + Unsafe.ReadUnaligned<int>(ref b[0x1B]);
 }
}

8 changes: 8 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_85765/Runtime_85765.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <Optimize>True</Optimize>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[JIT] ARM64 - Temporary fix for `ldp`/`stp` optimizations by TIHan · Pull Request #90534 · dotnet/runtime · GitHub
Skip to content
[JIT] ARM64 - Temporary fix for ldp/stp optimizations#90534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TIHan
merged 5 commits into

from

Aug 16, 2023
 Merged


[JIT] ARM64 - Temporary fix for ldp/stp optimizations
#90534
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
db3fa7e

Added regression test 85765


TIHan Aug 14, 2023
eaa5ac9

Mark M4 as NoInlining


TIHan Aug 14, 2023
782d7a2

Check current and last ins format to determine whether to proceed wit…


TIHan Aug 15, 2023
d62c69b

Additional test


TIHan Aug 15, 2023
8cebc50

Feedback


TIHan Aug 15, 2023

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


9 changes: 9 additions & 0 deletions
src/coreclr/jit/emitarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16615,6 +16615,15 @@ emitter::RegisterOrder emitter::IsOptimizableLdrStrWithPair(
 emitAttr prevSize = emitLastIns->idOpSize();
 ssize_t prevImm = emitGetInsSC(emitLastIns);

 // If we have this format, the 'imm' and/or 'prevImm' are not scaled(encoded),
 // therefore we cannot proceed.
 // TODO: In this context, 'imm' and 'prevImm' are assumed to be scaled(encoded).
 // They should never be scaled(encoded) until its about to be written to the buffer.
 if (fmt == IF_LS_2C || lastInsFmt == IF_LS_2C)
 {
 return eRO_none;
 }

 // Signed, *raw* immediate value fits in 7 bits, so for LDP/ STP the raw value is from -64 to +63.
 // For LDR/ STR, there are 9 bits, so we need to limit the range explicitly in software.
 if ((imm < -64) || (imm > 63) || (prevImm < -64) || (prevImm > 63))
Expand Down

63 changes: 63 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_85765/Runtime_85765.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// 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 Xunit;

public class Runtime_85765
{
 public struct S0
 {
 public S0(bool f1): this()
 {
 }
 }

 public struct S1
 {
 public byte F0;
 public bool F1;
 public bool F2;
 }

 [Fact]
 public static void Test()
 {
 S1 vr2 = M4();
 vr2.F2 |= vr2.F1;
 Assert.False(Consume(vr2.F2));
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 public static S1 M4()
 {
 S1 var1 = default(S1);
 var vr0 = new S0(false);
 return var1;
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 private static bool Consume(bool value)
 {
 return value;
 }

 // ------

 [Fact]
 public static void Test2()
 {
 byte* bytes = stackalloc byte[1024];
 bytes[0x1A] = 1;
 bytes[0x1B] = 2;
 int sum = Foo(bytes);
 Assert.True(sum == 515);
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 public static int Foo(byte* b)
 {
 return Unsafe.ReadUnaligned<int>(ref b[0x1A]) + Unsafe.ReadUnaligned<int>(ref b[0x1B]);
 }
}

8 changes: 8 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_85765/Runtime_85765.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <Optimize>True</Optimize>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[JIT] ARM64 - Temporary fix for `ldp`/`stp` optimizations by TIHan · Pull Request #90534 · dotnet/runtime · GitHub
Skip to content
[JIT] ARM64 - Temporary fix for ldp/stp optimizations#90534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TIHan
merged 5 commits into

from

Aug 16, 2023
 Merged


[JIT] ARM64 - Temporary fix for ldp/stp optimizations
#90534
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
db3fa7e

Added regression test 85765


TIHan Aug 14, 2023
eaa5ac9

Mark M4 as NoInlining


TIHan Aug 14, 2023
782d7a2

Check current and last ins format to determine whether to proceed wit…


TIHan Aug 15, 2023
d62c69b

Additional test


TIHan Aug 15, 2023
8cebc50

Feedback


TIHan Aug 15, 2023

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


9 changes: 9 additions & 0 deletions
src/coreclr/jit/emitarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16615,6 +16615,15 @@ emitter::RegisterOrder emitter::IsOptimizableLdrStrWithPair(
 emitAttr prevSize = emitLastIns->idOpSize();
 ssize_t prevImm = emitGetInsSC(emitLastIns);

 // If we have this format, the 'imm' and/or 'prevImm' are not scaled(encoded),
 // therefore we cannot proceed.
 // TODO: In this context, 'imm' and 'prevImm' are assumed to be scaled(encoded).
 // They should never be scaled(encoded) until its about to be written to the buffer.
 if (fmt == IF_LS_2C || lastInsFmt == IF_LS_2C)
 {
 return eRO_none;
 }

 // Signed, *raw* immediate value fits in 7 bits, so for LDP/ STP the raw value is from -64 to +63.
 // For LDR/ STR, there are 9 bits, so we need to limit the range explicitly in software.
 if ((imm < -64) || (imm > 63) || (prevImm < -64) || (prevImm > 63))
Expand Down

63 changes: 63 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_85765/Runtime_85765.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// 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 Xunit;

public class Runtime_85765
{
 public struct S0
 {
 public S0(bool f1): this()
 {
 }
 }

 public struct S1
 {
 public byte F0;
 public bool F1;
 public bool F2;
 }

 [Fact]
 public static void Test()
 {
 S1 vr2 = M4();
 vr2.F2 |= vr2.F1;
 Assert.False(Consume(vr2.F2));
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 public static S1 M4()
 {
 S1 var1 = default(S1);
 var vr0 = new S0(false);
 return var1;
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 private static bool Consume(bool value)
 {
 return value;
 }

 // ------

 [Fact]
 public static void Test2()
 {
 byte* bytes = stackalloc byte[1024];
 bytes[0x1A] = 1;
 bytes[0x1B] = 2;
 int sum = Foo(bytes);
 Assert.True(sum == 515);
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 public static int Foo(byte* b)
 {
 return Unsafe.ReadUnaligned<int>(ref b[0x1A]) + Unsafe.ReadUnaligned<int>(ref b[0x1B]);
 }
}

8 changes: 8 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_85765/Runtime_85765.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <Optimize>True</Optimize>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[JIT] ARM64 - Temporary fix for `ldp`/`stp` optimizations by TIHan · Pull Request #90534 · dotnet/runtime · GitHub
Skip to content
[JIT] ARM64 - Temporary fix for ldp/stp optimizations#90534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TIHan
merged 5 commits into

from

Aug 16, 2023
 Merged


[JIT] ARM64 - Temporary fix for ldp/stp optimizations
#90534
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
db3fa7e

Added regression test 85765


TIHan Aug 14, 2023
eaa5ac9

Mark M4 as NoInlining


TIHan Aug 14, 2023
782d7a2

Check current and last ins format to determine whether to proceed wit…


TIHan Aug 15, 2023
d62c69b

Additional test


TIHan Aug 15, 2023
8cebc50

Feedback


TIHan Aug 15, 2023

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


9 changes: 9 additions & 0 deletions
src/coreclr/jit/emitarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16615,6 +16615,15 @@ emitter::RegisterOrder emitter::IsOptimizableLdrStrWithPair(
 emitAttr prevSize = emitLastIns->idOpSize();
 ssize_t prevImm = emitGetInsSC(emitLastIns);

 // If we have this format, the 'imm' and/or 'prevImm' are not scaled(encoded),
 // therefore we cannot proceed.
 // TODO: In this context, 'imm' and 'prevImm' are assumed to be scaled(encoded).
 // They should never be scaled(encoded) until its about to be written to the buffer.
 if (fmt == IF_LS_2C || lastInsFmt == IF_LS_2C)
 {
 return eRO_none;
 }

 // Signed, *raw* immediate value fits in 7 bits, so for LDP/ STP the raw value is from -64 to +63.
 // For LDR/ STR, there are 9 bits, so we need to limit the range explicitly in software.
 if ((imm < -64) || (imm > 63) || (prevImm < -64) || (prevImm > 63))
Expand Down

63 changes: 63 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_85765/Runtime_85765.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// 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 Xunit;

public class Runtime_85765
{
 public struct S0
 {
 public S0(bool f1): this()
 {
 }
 }

 public struct S1
 {
 public byte F0;
 public bool F1;
 public bool F2;
 }

 [Fact]
 public static void Test()
 {
 S1 vr2 = M4();
 vr2.F2 |= vr2.F1;
 Assert.False(Consume(vr2.F2));
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 public static S1 M4()
 {
 S1 var1 = default(S1);
 var vr0 = new S0(false);
 return var1;
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 private static bool Consume(bool value)
 {
 return value;
 }

 // ------

 [Fact]
 public static void Test2()
 {
 byte* bytes = stackalloc byte[1024];
 bytes[0x1A] = 1;
 bytes[0x1B] = 2;
 int sum = Foo(bytes);
 Assert.True(sum == 515);
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 public static int Foo(byte* b)
 {
 return Unsafe.ReadUnaligned<int>(ref b[0x1A]) + Unsafe.ReadUnaligned<int>(ref b[0x1B]);
 }
}

8 changes: 8 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_85765/Runtime_85765.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <Optimize>True</Optimize>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 </ItemGroup>
</Project>

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
[JIT] ARM64 - Temporary fix for `ldp`/`stp` optimizations by TIHan · Pull Request #90534 · dotnet/runtime · GitHub
Skip to content
[JIT] ARM64 - Temporary fix for ldp/stp optimizations#90534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TIHan
merged 5 commits into

from

Aug 16, 2023
 Merged


[JIT] ARM64 - Temporary fix for ldp/stp optimizations
#90534
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
db3fa7e

Added regression test 85765


TIHan Aug 14, 2023
eaa5ac9

Mark M4 as NoInlining


TIHan Aug 14, 2023
782d7a2

Check current and last ins format to determine whether to proceed wit…


TIHan Aug 15, 2023
d62c69b

Additional test


TIHan Aug 15, 2023
8cebc50

Feedback


TIHan Aug 15, 2023

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


9 changes: 9 additions & 0 deletions
src/coreclr/jit/emitarm64.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16615,6 +16615,15 @@ emitter::RegisterOrder emitter::IsOptimizableLdrStrWithPair(
 emitAttr prevSize = emitLastIns->idOpSize();
 ssize_t prevImm = emitGetInsSC(emitLastIns);

 // If we have this format, the 'imm' and/or 'prevImm' are not scaled(encoded),
 // therefore we cannot proceed.
 // TODO: In this context, 'imm' and 'prevImm' are assumed to be scaled(encoded).
 // They should never be scaled(encoded) until its about to be written to the buffer.
 if (fmt == IF_LS_2C || lastInsFmt == IF_LS_2C)
 {
 return eRO_none;
 }

 // Signed, *raw* immediate value fits in 7 bits, so for LDP/ STP the raw value is from -64 to +63.
 // For LDR/ STR, there are 9 bits, so we need to limit the range explicitly in software.
 if ((imm < -64) || (imm > 63) || (prevImm < -64) || (prevImm > 63))
Expand Down

63 changes: 63 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_85765/Runtime_85765.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
// 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 Xunit;

public class Runtime_85765
{
 public struct S0
 {
 public S0(bool f1): this()
 {
 }
 }

 public struct S1
 {
 public byte F0;
 public bool F1;
 public bool F2;
 }

 [Fact]
 public static void Test()
 {
 S1 vr2 = M4();
 vr2.F2 |= vr2.F1;
 Assert.False(Consume(vr2.F2));
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 public static S1 M4()
 {
 S1 var1 = default(S1);
 var vr0 = new S0(false);
 return var1;
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 private static bool Consume(bool value)
 {
 return value;
 }

 // ------

 [Fact]
 public static void Test2()
 {
 byte* bytes = stackalloc byte[1024];
 bytes[0x1A] = 1;
 bytes[0x1B] = 2;
 int sum = Foo(bytes);
 Assert.True(sum == 515);
 }

 [MethodImpl(MethodImplOptions.NoInlining)]
 public static int Foo(byte* b)
 {
 return Unsafe.ReadUnaligned<int>(ref b[0x1A]) + Unsafe.ReadUnaligned<int>(ref b[0x1B]);
 }
}

8 changes: 8 additions & 0 deletions
src/tests/JIT/Regression/JitBlue/Runtime_85765/Runtime_85765.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
 <Optimize>True</Optimize>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="$(MSBuildProjectName).cs" />
 </ItemGroup>
</Project>