Remove unnecessary endianness dependent logic - #104332

Merged
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian
Jul 8, 2024
Merged

Remove unnecessary endianness dependent logic#104332
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian

Conversation

@buyaa-n

@buyaa-nbuyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
Contributor

Before my PR #102364 the Base64Encoder was populating uint by concatenating encoded 4 bytes (by accounting the endianness)

uinti0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
uinti1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
uinti2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
uinti3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
returni0|(i1<<8)|(i2<<16)|(i3<<24);
}
else
{
return(i0<<24)|(i1<<16)|(i2<<8)|i3;
}

and was writing that uint to the destination buffer:
result=Encode(src,refencodingMap);
Unsafe.WriteUnaligned(dest,result);

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once), where I kept the endianness logic when I should not, endianness has no effect for ASCII characters:
bytei0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
bytei1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
bytei2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
bytei3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
destination[0]=i0;
destination[1]=i1;
destination[2]=i2;
destination[3]=i3;
}
else
{
destination[3]=i0;
destination[2]=i1;
destination[1]=i2;
destination[0]=i3;
}

Fixes#104283

@ghostghost added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jul 2, 2024
@buyaa-n
buyaa-n requested review from stephentoub and tmdsJuly 2, 2024 21:20
@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-nbuyaa-n added area-System.Memory and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Jul 2, 2024
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/area-system-memory
See info in area-owners.md if you want to be subscribed.

@stephentoub

Copy link
Copy Markdown
Member

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once)

Why?

@buyaa-n

buyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
ContributorAuthor

Why?

I think I had build error for Unsafe.WriteUnaligned(dest, result); when changed the dest type to T, though that doesn't seem happen now, is this less performant? I can revert that change NO, I need to keep it

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@stephentoub

stephentoub commented Jul 3, 2024

Copy link
Copy Markdown
Member

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

But writing to a ulong would work in that case, no?

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

But writing to a ulong would work in that case, no?

Did not think about that 😄. Though it looks to me more efficient, no? Compared to doing several |, << operations, I can change then

@buyaa-n

buyaa-n commented Jul 3, 2024

Copy link
Copy Markdown
ContributorAuthor

Though it looks to me more efficient, no?

According to the local perf test, turns out the old approach is bit more performant, reverted to old approach except the case where padding is omitted and not writing 4 bytes to destination

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n
buyaa-n requested a review from stephentoubJuly 5, 2024 18:59
@saitama951

saitama951 commented Jul 7, 2024

Copy link
Copy Markdown
Contributor

@buyaa-n The s390x community CI was timing out since last week, This has been fixed now. can you please re-run the CI?

@stephentoub

Copy link
Copy Markdown
Member

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Failures are unrelated and known

@buyaa-n
buyaa-n merged commit 101c0da into dotnet:mainJul 8, 2024
@buyaa-n
buyaa-n deleted the big-endian branch July 8, 2024 15:23
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Aug 9, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Base64url tests fail on s390x (big endian)

3 participants

@buyaa-n@stephentoub@saitama951
, '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" + '
Skip to content

Remove unnecessary endianness dependent logic - #104332

Merged
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian
Jul 8, 2024
Merged

Remove unnecessary endianness dependent logic#104332
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian

Conversation

@buyaa-n

@buyaa-nbuyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
Contributor

Before my PR #102364 the Base64Encoder was populating uint by concatenating encoded 4 bytes (by accounting the endianness)

uinti0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
uinti1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
uinti2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
uinti3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
returni0|(i1<<8)|(i2<<16)|(i3<<24);
}
else
{
return(i0<<24)|(i1<<16)|(i2<<8)|i3;
}

and was writing that uint to the destination buffer:
result=Encode(src,refencodingMap);
Unsafe.WriteUnaligned(dest,result);

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once), where I kept the endianness logic when I should not, endianness has no effect for ASCII characters:
bytei0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
bytei1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
bytei2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
bytei3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
destination[0]=i0;
destination[1]=i1;
destination[2]=i2;
destination[3]=i3;
}
else
{
destination[3]=i0;
destination[2]=i1;
destination[1]=i2;
destination[0]=i3;
}

Fixes#104283

@ghostghost added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jul 2, 2024
@buyaa-n
buyaa-n requested review from stephentoub and tmdsJuly 2, 2024 21:20
@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-nbuyaa-n added area-System.Memory and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Jul 2, 2024
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/area-system-memory
See info in area-owners.md if you want to be subscribed.

@stephentoub

Copy link
Copy Markdown
Member

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once)

Why?

@buyaa-n

buyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
ContributorAuthor

Why?

I think I had build error for Unsafe.WriteUnaligned(dest, result); when changed the dest type to T, though that doesn't seem happen now, is this less performant? I can revert that change NO, I need to keep it

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@stephentoub

stephentoub commented Jul 3, 2024

Copy link
Copy Markdown
Member

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

But writing to a ulong would work in that case, no?

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

But writing to a ulong would work in that case, no?

Did not think about that 😄. Though it looks to me more efficient, no? Compared to doing several |, << operations, I can change then

@buyaa-n

buyaa-n commented Jul 3, 2024

Copy link
Copy Markdown
ContributorAuthor

Though it looks to me more efficient, no?

According to the local perf test, turns out the old approach is bit more performant, reverted to old approach except the case where padding is omitted and not writing 4 bytes to destination

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n
buyaa-n requested a review from stephentoubJuly 5, 2024 18:59
@saitama951

saitama951 commented Jul 7, 2024

Copy link
Copy Markdown
Contributor

@buyaa-n The s390x community CI was timing out since last week, This has been fixed now. can you please re-run the CI?

@stephentoub

Copy link
Copy Markdown
Member

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Failures are unrelated and known

@buyaa-n
buyaa-n merged commit 101c0da into dotnet:mainJul 8, 2024
@buyaa-n
buyaa-n deleted the big-endian branch July 8, 2024 15:23
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Aug 9, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Base64url tests fail on s390x (big endian)

3 participants

@buyaa-n@stephentoub@saitama951
, '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('^' + ".*" + '
Skip to content

Remove unnecessary endianness dependent logic - #104332

Merged
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian
Jul 8, 2024
Merged

Remove unnecessary endianness dependent logic#104332
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian

Conversation

@buyaa-n

@buyaa-nbuyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
Contributor

Before my PR #102364 the Base64Encoder was populating uint by concatenating encoded 4 bytes (by accounting the endianness)

uinti0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
uinti1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
uinti2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
uinti3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
returni0|(i1<<8)|(i2<<16)|(i3<<24);
}
else
{
return(i0<<24)|(i1<<16)|(i2<<8)|i3;
}

and was writing that uint to the destination buffer:
result=Encode(src,refencodingMap);
Unsafe.WriteUnaligned(dest,result);

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once), where I kept the endianness logic when I should not, endianness has no effect for ASCII characters:
bytei0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
bytei1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
bytei2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
bytei3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
destination[0]=i0;
destination[1]=i1;
destination[2]=i2;
destination[3]=i3;
}
else
{
destination[3]=i0;
destination[2]=i1;
destination[1]=i2;
destination[0]=i3;
}

Fixes#104283

@ghostghost added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jul 2, 2024
@buyaa-n
buyaa-n requested review from stephentoub and tmdsJuly 2, 2024 21:20
@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-nbuyaa-n added area-System.Memory and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Jul 2, 2024
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/area-system-memory
See info in area-owners.md if you want to be subscribed.

@stephentoub

Copy link
Copy Markdown
Member

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once)

Why?

@buyaa-n

buyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
ContributorAuthor

Why?

I think I had build error for Unsafe.WriteUnaligned(dest, result); when changed the dest type to T, though that doesn't seem happen now, is this less performant? I can revert that change NO, I need to keep it

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@stephentoub

stephentoub commented Jul 3, 2024

Copy link
Copy Markdown
Member

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

But writing to a ulong would work in that case, no?

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

But writing to a ulong would work in that case, no?

Did not think about that 😄. Though it looks to me more efficient, no? Compared to doing several |, << operations, I can change then

@buyaa-n

buyaa-n commented Jul 3, 2024

Copy link
Copy Markdown
ContributorAuthor

Though it looks to me more efficient, no?

According to the local perf test, turns out the old approach is bit more performant, reverted to old approach except the case where padding is omitted and not writing 4 bytes to destination

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n
buyaa-n requested a review from stephentoubJuly 5, 2024 18:59
@saitama951

saitama951 commented Jul 7, 2024

Copy link
Copy Markdown
Contributor

@buyaa-n The s390x community CI was timing out since last week, This has been fixed now. can you please re-run the CI?

@stephentoub

Copy link
Copy Markdown
Member

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Failures are unrelated and known

@buyaa-n
buyaa-n merged commit 101c0da into dotnet:mainJul 8, 2024
@buyaa-n
buyaa-n deleted the big-endian branch July 8, 2024 15:23
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Aug 9, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Base64url tests fail on s390x (big endian)

3 participants

@buyaa-n@stephentoub@saitama951
, '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('^' + ".*" + '
Skip to content

Remove unnecessary endianness dependent logic - #104332

Merged
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian
Jul 8, 2024
Merged

Remove unnecessary endianness dependent logic#104332
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian

Conversation

@buyaa-n

@buyaa-nbuyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
Contributor

Before my PR #102364 the Base64Encoder was populating uint by concatenating encoded 4 bytes (by accounting the endianness)

uinti0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
uinti1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
uinti2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
uinti3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
returni0|(i1<<8)|(i2<<16)|(i3<<24);
}
else
{
return(i0<<24)|(i1<<16)|(i2<<8)|i3;
}

and was writing that uint to the destination buffer:
result=Encode(src,refencodingMap);
Unsafe.WriteUnaligned(dest,result);

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once), where I kept the endianness logic when I should not, endianness has no effect for ASCII characters:
bytei0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
bytei1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
bytei2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
bytei3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
destination[0]=i0;
destination[1]=i1;
destination[2]=i2;
destination[3]=i3;
}
else
{
destination[3]=i0;
destination[2]=i1;
destination[1]=i2;
destination[0]=i3;
}

Fixes#104283

@ghostghost added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jul 2, 2024
@buyaa-n
buyaa-n requested review from stephentoub and tmdsJuly 2, 2024 21:20
@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-nbuyaa-n added area-System.Memory and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Jul 2, 2024
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/area-system-memory
See info in area-owners.md if you want to be subscribed.

@stephentoub

Copy link
Copy Markdown
Member

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once)

Why?

@buyaa-n

buyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
ContributorAuthor

Why?

I think I had build error for Unsafe.WriteUnaligned(dest, result); when changed the dest type to T, though that doesn't seem happen now, is this less performant? I can revert that change NO, I need to keep it

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@stephentoub

stephentoub commented Jul 3, 2024

Copy link
Copy Markdown
Member

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

But writing to a ulong would work in that case, no?

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

But writing to a ulong would work in that case, no?

Did not think about that 😄. Though it looks to me more efficient, no? Compared to doing several |, << operations, I can change then

@buyaa-n

buyaa-n commented Jul 3, 2024

Copy link
Copy Markdown
ContributorAuthor

Though it looks to me more efficient, no?

According to the local perf test, turns out the old approach is bit more performant, reverted to old approach except the case where padding is omitted and not writing 4 bytes to destination

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n
buyaa-n requested a review from stephentoubJuly 5, 2024 18:59
@saitama951

saitama951 commented Jul 7, 2024

Copy link
Copy Markdown
Contributor

@buyaa-n The s390x community CI was timing out since last week, This has been fixed now. can you please re-run the CI?

@stephentoub

Copy link
Copy Markdown
Member

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Failures are unrelated and known

@buyaa-n
buyaa-n merged commit 101c0da into dotnet:mainJul 8, 2024
@buyaa-n
buyaa-n deleted the big-endian branch July 8, 2024 15:23
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Aug 9, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Base64url tests fail on s390x (big endian)

3 participants

@buyaa-n@stephentoub@saitama951
, '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" + '
Skip to content

Remove unnecessary endianness dependent logic - #104332

Merged
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian
Jul 8, 2024
Merged

Remove unnecessary endianness dependent logic#104332
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian

Conversation

@buyaa-n

@buyaa-nbuyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
Contributor

Before my PR #102364 the Base64Encoder was populating uint by concatenating encoded 4 bytes (by accounting the endianness)

uinti0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
uinti1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
uinti2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
uinti3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
returni0|(i1<<8)|(i2<<16)|(i3<<24);
}
else
{
return(i0<<24)|(i1<<16)|(i2<<8)|i3;
}

and was writing that uint to the destination buffer:
result=Encode(src,refencodingMap);
Unsafe.WriteUnaligned(dest,result);

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once), where I kept the endianness logic when I should not, endianness has no effect for ASCII characters:
bytei0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
bytei1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
bytei2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
bytei3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
destination[0]=i0;
destination[1]=i1;
destination[2]=i2;
destination[3]=i3;
}
else
{
destination[3]=i0;
destination[2]=i1;
destination[1]=i2;
destination[0]=i3;
}

Fixes#104283

@ghostghost added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jul 2, 2024
@buyaa-n
buyaa-n requested review from stephentoub and tmdsJuly 2, 2024 21:20
@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-nbuyaa-n added area-System.Memory and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Jul 2, 2024
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/area-system-memory
See info in area-owners.md if you want to be subscribed.

@stephentoub

Copy link
Copy Markdown
Member

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once)

Why?

@buyaa-n

buyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
ContributorAuthor

Why?

I think I had build error for Unsafe.WriteUnaligned(dest, result); when changed the dest type to T, though that doesn't seem happen now, is this less performant? I can revert that change NO, I need to keep it

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@stephentoub

stephentoub commented Jul 3, 2024

Copy link
Copy Markdown
Member

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

But writing to a ulong would work in that case, no?

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

But writing to a ulong would work in that case, no?

Did not think about that 😄. Though it looks to me more efficient, no? Compared to doing several |, << operations, I can change then

@buyaa-n

buyaa-n commented Jul 3, 2024

Copy link
Copy Markdown
ContributorAuthor

Though it looks to me more efficient, no?

According to the local perf test, turns out the old approach is bit more performant, reverted to old approach except the case where padding is omitted and not writing 4 bytes to destination

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n
buyaa-n requested a review from stephentoubJuly 5, 2024 18:59
@saitama951

saitama951 commented Jul 7, 2024

Copy link
Copy Markdown
Contributor

@buyaa-n The s390x community CI was timing out since last week, This has been fixed now. can you please re-run the CI?

@stephentoub

Copy link
Copy Markdown
Member

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Failures are unrelated and known

@buyaa-n
buyaa-n merged commit 101c0da into dotnet:mainJul 8, 2024
@buyaa-n
buyaa-n deleted the big-endian branch July 8, 2024 15:23
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Aug 9, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Base64url tests fail on s390x (big endian)

3 participants

@buyaa-n@stephentoub@saitama951
, '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('^' + ".*" + '
Skip to content

Remove unnecessary endianness dependent logic - #104332

Merged
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian
Jul 8, 2024
Merged

Remove unnecessary endianness dependent logic#104332
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian

Conversation

@buyaa-n

@buyaa-nbuyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
Contributor

Before my PR #102364 the Base64Encoder was populating uint by concatenating encoded 4 bytes (by accounting the endianness)

uinti0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
uinti1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
uinti2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
uinti3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
returni0|(i1<<8)|(i2<<16)|(i3<<24);
}
else
{
return(i0<<24)|(i1<<16)|(i2<<8)|i3;
}

and was writing that uint to the destination buffer:
result=Encode(src,refencodingMap);
Unsafe.WriteUnaligned(dest,result);

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once), where I kept the endianness logic when I should not, endianness has no effect for ASCII characters:
bytei0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
bytei1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
bytei2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
bytei3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
destination[0]=i0;
destination[1]=i1;
destination[2]=i2;
destination[3]=i3;
}
else
{
destination[3]=i0;
destination[2]=i1;
destination[1]=i2;
destination[0]=i3;
}

Fixes#104283

@ghostghost added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jul 2, 2024
@buyaa-n
buyaa-n requested review from stephentoub and tmdsJuly 2, 2024 21:20
@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-nbuyaa-n added area-System.Memory and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Jul 2, 2024
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/area-system-memory
See info in area-owners.md if you want to be subscribed.

@stephentoub

Copy link
Copy Markdown
Member

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once)

Why?

@buyaa-n

buyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
ContributorAuthor

Why?

I think I had build error for Unsafe.WriteUnaligned(dest, result); when changed the dest type to T, though that doesn't seem happen now, is this less performant? I can revert that change NO, I need to keep it

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@stephentoub

stephentoub commented Jul 3, 2024

Copy link
Copy Markdown
Member

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

But writing to a ulong would work in that case, no?

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

But writing to a ulong would work in that case, no?

Did not think about that 😄. Though it looks to me more efficient, no? Compared to doing several |, << operations, I can change then

@buyaa-n

buyaa-n commented Jul 3, 2024

Copy link
Copy Markdown
ContributorAuthor

Though it looks to me more efficient, no?

According to the local perf test, turns out the old approach is bit more performant, reverted to old approach except the case where padding is omitted and not writing 4 bytes to destination

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n
buyaa-n requested a review from stephentoubJuly 5, 2024 18:59
@saitama951

saitama951 commented Jul 7, 2024

Copy link
Copy Markdown
Contributor

@buyaa-n The s390x community CI was timing out since last week, This has been fixed now. can you please re-run the CI?

@stephentoub

Copy link
Copy Markdown
Member

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Failures are unrelated and known

@buyaa-n
buyaa-n merged commit 101c0da into dotnet:mainJul 8, 2024
@buyaa-n
buyaa-n deleted the big-endian branch July 8, 2024 15:23
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Aug 9, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Base64url tests fail on s390x (big endian)

3 participants

@buyaa-n@stephentoub@saitama951
, '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); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Remove unnecessary endianness dependent logic - #104332

Merged
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian
Jul 8, 2024
Merged

Remove unnecessary endianness dependent logic#104332
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian

Conversation

@buyaa-n

@buyaa-nbuyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
Contributor

Before my PR #102364 the Base64Encoder was populating uint by concatenating encoded 4 bytes (by accounting the endianness)

uinti0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
uinti1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
uinti2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
uinti3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
returni0|(i1<<8)|(i2<<16)|(i3<<24);
}
else
{
return(i0<<24)|(i1<<16)|(i2<<8)|i3;
}

and was writing that uint to the destination buffer:
result=Encode(src,refencodingMap);
Unsafe.WriteUnaligned(dest,result);

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once), where I kept the endianness logic when I should not, endianness has no effect for ASCII characters:
bytei0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
bytei1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
bytei2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
bytei3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
destination[0]=i0;
destination[1]=i1;
destination[2]=i2;
destination[3]=i3;
}
else
{
destination[3]=i0;
destination[2]=i1;
destination[1]=i2;
destination[0]=i3;
}

Fixes#104283

@ghostghost added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jul 2, 2024
@buyaa-n
buyaa-n requested review from stephentoub and tmdsJuly 2, 2024 21:20
@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-nbuyaa-n added area-System.Memory and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Jul 2, 2024
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/area-system-memory
See info in area-owners.md if you want to be subscribed.

@stephentoub

Copy link
Copy Markdown
Member

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once)

Why?

@buyaa-n

buyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
ContributorAuthor

Why?

I think I had build error for Unsafe.WriteUnaligned(dest, result); when changed the dest type to T, though that doesn't seem happen now, is this less performant? I can revert that change NO, I need to keep it

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@stephentoub

stephentoub commented Jul 3, 2024

Copy link
Copy Markdown
Member

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

But writing to a ulong would work in that case, no?

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

But writing to a ulong would work in that case, no?

Did not think about that 😄. Though it looks to me more efficient, no? Compared to doing several |, << operations, I can change then

@buyaa-n

buyaa-n commented Jul 3, 2024

Copy link
Copy Markdown
ContributorAuthor

Though it looks to me more efficient, no?

According to the local perf test, turns out the old approach is bit more performant, reverted to old approach except the case where padding is omitted and not writing 4 bytes to destination

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n
buyaa-n requested a review from stephentoubJuly 5, 2024 18:59
@saitama951

saitama951 commented Jul 7, 2024

Copy link
Copy Markdown
Contributor

@buyaa-n The s390x community CI was timing out since last week, This has been fixed now. can you please re-run the CI?

@stephentoub

Copy link
Copy Markdown
Member

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Failures are unrelated and known

@buyaa-n
buyaa-n merged commit 101c0da into dotnet:mainJul 8, 2024
@buyaa-n
buyaa-n deleted the big-endian branch July 8, 2024 15:23
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Aug 9, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Base64url tests fail on s390x (big endian)

3 participants

@buyaa-n@stephentoub@saitama951
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Remove unnecessary endianness dependent logic - #104332

Merged
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian
Jul 8, 2024
Merged

Remove unnecessary endianness dependent logic#104332
buyaa-n merged 4 commits into
dotnet:mainfrom
buyaa-n:big-endian

Conversation

@buyaa-n

@buyaa-nbuyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
Contributor

Before my PR #102364 the Base64Encoder was populating uint by concatenating encoded 4 bytes (by accounting the endianness)

uinti0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
uinti1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
uinti2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
uinti3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
returni0|(i1<<8)|(i2<<16)|(i3<<24);
}
else
{
return(i0<<24)|(i1<<16)|(i2<<8)|i3;
}

and was writing that uint to the destination buffer:
result=Encode(src,refencodingMap);
Unsafe.WriteUnaligned(dest,result);

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once), where I kept the endianness logic when I should not, endianness has no effect for ASCII characters:
bytei0=Unsafe.Add(refencodingMap,(IntPtr)(i>>18));
bytei1=Unsafe.Add(refencodingMap,(IntPtr)((i>>12)&0x3F));
bytei2=Unsafe.Add(refencodingMap,(IntPtr)((i>>6)&0x3F));
bytei3=Unsafe.Add(refencodingMap,(IntPtr)(i&0x3F));
if(BitConverter.IsLittleEndian)
{
destination[0]=i0;
destination[1]=i1;
destination[2]=i2;
destination[3]=i3;
}
else
{
destination[3]=i0;
destination[2]=i1;
destination[1]=i2;
destination[0]=i3;
}

Fixes#104283

@ghostghost added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jul 2, 2024
@buyaa-n
buyaa-n requested review from stephentoub and tmdsJuly 2, 2024 21:20
@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-nbuyaa-n added area-System.Memory and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Jul 2, 2024
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/area-system-memory
See info in area-owners.md if you want to be subscribed.

@stephentoub

Copy link
Copy Markdown
Member

I changed that to directly assign encoded bytes to destination (instead of concatenating them into one uint and write once)

Why?

@buyaa-n

buyaa-n commented Jul 2, 2024

Copy link
Copy Markdown
ContributorAuthor

Why?

I think I had build error for Unsafe.WriteUnaligned(dest, result); when changed the dest type to T, though that doesn't seem happen now, is this less performant? I can revert that change NO, I need to keep it

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@stephentoub

stephentoub commented Jul 3, 2024

Copy link
Copy Markdown
Member

Why?

Now I know why I did this, writing uint to dest only work for byte* dest, but will not work for ushort* dest

But writing to a ulong would work in that case, no?

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

But writing to a ulong would work in that case, no?

Did not think about that 😄. Though it looks to me more efficient, no? Compared to doing several |, << operations, I can change then

@buyaa-n

buyaa-n commented Jul 3, 2024

Copy link
Copy Markdown
ContributorAuthor

Though it looks to me more efficient, no?

According to the local perf test, turns out the old approach is bit more performant, reverted to old approach except the case where padding is omitted and not writing 4 bytes to destination

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n
buyaa-n requested a review from stephentoubJuly 5, 2024 18:59
@saitama951

saitama951 commented Jul 7, 2024

Copy link
Copy Markdown
Contributor

@buyaa-n The s390x community CI was timing out since last week, This has been fixed now. can you please re-run the CI?

@stephentoub

Copy link
Copy Markdown
Member

/azp run runtime-community

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@buyaa-n

Copy link
Copy Markdown
ContributorAuthor

Failures are unrelated and known

@buyaa-n
buyaa-n merged commit 101c0da into dotnet:mainJul 8, 2024
@buyaa-n
buyaa-n deleted the big-endian branch July 8, 2024 15:23
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Aug 9, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Base64url tests fail on s390x (big endian)

3 participants

@buyaa-n@stephentoub@saitama951