Skip to content

[NativeAOT] Fix --make-repro-path ILC option - #90935

Merged
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro
Aug 23, 2023
Merged

[NativeAOT] Fix --make-repro-path ILC option#90935
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro

Conversation

@ivanpovazan

Copy link
Copy Markdown
Member

This PR fixes a regression with --make-repro-path command line option which was caused by upgrading the System.CommandLine version in: #84229

The issue is related to the fact that CliOption.Name now includes -- (eg: option.Name == --targetos:OSX) causing --make-repro-path to generate extra hyphens in the repro.rsp file, for example:

----reference:0/WindowsBase.dll
----reference:1/System.Private.CoreLib.dll
----reference:2/System.Private.DisabledReflection.dll
...

Tested manually by:

  1. Creating a repro.zip by including the --make-repro-path option during compilation
  2. Unzipping the repro.zip
  3. Compiling the assemblies from the unzipped folder by passing the generated repro.rsp

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

/cc: @am11

@am11am11 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

@am11

am11 commented Aug 22, 2023

Copy link
Copy Markdown
Member

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

No worries, I accidentally bumped into this. As you rightfully suggested:

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

it would be great to have a test, so we catch this kind of unintentional regressions. However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like. Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

@am11

am11 commented Aug 23, 2023

Copy link
Copy Markdown
Member

However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like.

I agree. Perhaps the options which are frequently used by ILC, e.g. from obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp file when we PublishAot a console app.

Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

I think the original and generated rsp files are not comparable easily. Moreover, if we want to also verify that the repro package actually works, we can do something similar to:

  • dotnet publish -p:PublishAot=true a console app to auto-generate the RSP file under obj/ dir (so we don't need to worry about keeping it in sync with moving target)
  • Append --make-repro-path line to aot.ilc.rsp
  • Execute ilc @"obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp"
  • Extract the package in repro1/
  • Insert --make-repro-path line in repro1's repro.rsp and run ilc @repro.rsp (working directory needs to be the extraction location)
  • Extract the second package in repro2/
  • Insert --make-repro-path line in repro2's repro.rsp
  • Compare if the extracted RSP files match (produce zero diffs)

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

That sounds good, however I am not sure where would such test be placed (we had similar discussions around build/running ios test apps, which ended up being treated as functional tests - sharing the Mono setup).

@MichalStrehovsky what do you think?

@jkotas

jkotas commented Aug 23, 2023

Copy link
Copy Markdown
Member

dotnet/runtime repo does not have a good place for tests that exercise E2E tool flows. A good place to add a test like this one would be the SDK repo (see https://github.com/dotnet/sdk/blob/364773edba30d46ac95e3b32c08f46168e96bd35/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs for prior art).

@jkotas
jkotas merged commit 3ef2c80 into dotnet:mainAug 23, 2023
@jkotas

Copy link
Copy Markdown
Member

/backport to release/8.0

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5952974913

@jkotas

Copy link
Copy Markdown
Member

test

Opened #91013

@ivanpovazan
ivanpovazan deleted the fix-make-repro branch August 28, 2023 10:32
@ghostghost locked as resolved and limited conversation to collaborators Sep 27, 2023
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.

3 participants

@ivanpovazan@am11@jkotas
, '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" + '
[NativeAOT] Fix `--make-repro-path` ILC option by ivanpovazan · Pull Request #90935 · dotnet/runtime · GitHub
Skip to content

[NativeAOT] Fix --make-repro-path ILC option - #90935

Merged
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro
Aug 23, 2023
Merged

[NativeAOT] Fix --make-repro-path ILC option#90935
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro

Conversation

@ivanpovazan

Copy link
Copy Markdown
Member

This PR fixes a regression with --make-repro-path command line option which was caused by upgrading the System.CommandLine version in: #84229

The issue is related to the fact that CliOption.Name now includes -- (eg: option.Name == --targetos:OSX) causing --make-repro-path to generate extra hyphens in the repro.rsp file, for example:

----reference:0/WindowsBase.dll
----reference:1/System.Private.CoreLib.dll
----reference:2/System.Private.DisabledReflection.dll
...

Tested manually by:

  1. Creating a repro.zip by including the --make-repro-path option during compilation
  2. Unzipping the repro.zip
  3. Compiling the assemblies from the unzipped folder by passing the generated repro.rsp

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

/cc: @am11

@am11am11 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

@am11

am11 commented Aug 22, 2023

Copy link
Copy Markdown
Member

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

No worries, I accidentally bumped into this. As you rightfully suggested:

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

it would be great to have a test, so we catch this kind of unintentional regressions. However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like. Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

@am11

am11 commented Aug 23, 2023

Copy link
Copy Markdown
Member

However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like.

I agree. Perhaps the options which are frequently used by ILC, e.g. from obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp file when we PublishAot a console app.

Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

I think the original and generated rsp files are not comparable easily. Moreover, if we want to also verify that the repro package actually works, we can do something similar to:

  • dotnet publish -p:PublishAot=true a console app to auto-generate the RSP file under obj/ dir (so we don't need to worry about keeping it in sync with moving target)
  • Append --make-repro-path line to aot.ilc.rsp
  • Execute ilc @"obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp"
  • Extract the package in repro1/
  • Insert --make-repro-path line in repro1's repro.rsp and run ilc @repro.rsp (working directory needs to be the extraction location)
  • Extract the second package in repro2/
  • Insert --make-repro-path line in repro2's repro.rsp
  • Compare if the extracted RSP files match (produce zero diffs)

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

That sounds good, however I am not sure where would such test be placed (we had similar discussions around build/running ios test apps, which ended up being treated as functional tests - sharing the Mono setup).

@MichalStrehovsky what do you think?

@jkotas

jkotas commented Aug 23, 2023

Copy link
Copy Markdown
Member

dotnet/runtime repo does not have a good place for tests that exercise E2E tool flows. A good place to add a test like this one would be the SDK repo (see https://github.com/dotnet/sdk/blob/364773edba30d46ac95e3b32c08f46168e96bd35/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs for prior art).

@jkotas
jkotas merged commit 3ef2c80 into dotnet:mainAug 23, 2023
@jkotas

Copy link
Copy Markdown
Member

/backport to release/8.0

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5952974913

@jkotas

Copy link
Copy Markdown
Member

test

Opened #91013

@ivanpovazan
ivanpovazan deleted the fix-make-repro branch August 28, 2023 10:32
@ghostghost locked as resolved and limited conversation to collaborators Sep 27, 2023
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.

3 participants

@ivanpovazan@am11@jkotas
, '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('^' + ".*" + ' [NativeAOT] Fix `--make-repro-path` ILC option by ivanpovazan · Pull Request #90935 · dotnet/runtime · GitHub
Skip to content

[NativeAOT] Fix --make-repro-path ILC option - #90935

Merged
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro
Aug 23, 2023
Merged

[NativeAOT] Fix --make-repro-path ILC option#90935
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro

Conversation

@ivanpovazan

Copy link
Copy Markdown
Member

This PR fixes a regression with --make-repro-path command line option which was caused by upgrading the System.CommandLine version in: #84229

The issue is related to the fact that CliOption.Name now includes -- (eg: option.Name == --targetos:OSX) causing --make-repro-path to generate extra hyphens in the repro.rsp file, for example:

----reference:0/WindowsBase.dll
----reference:1/System.Private.CoreLib.dll
----reference:2/System.Private.DisabledReflection.dll
...

Tested manually by:

  1. Creating a repro.zip by including the --make-repro-path option during compilation
  2. Unzipping the repro.zip
  3. Compiling the assemblies from the unzipped folder by passing the generated repro.rsp

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

/cc: @am11

@am11am11 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

@am11

am11 commented Aug 22, 2023

Copy link
Copy Markdown
Member

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

No worries, I accidentally bumped into this. As you rightfully suggested:

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

it would be great to have a test, so we catch this kind of unintentional regressions. However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like. Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

@am11

am11 commented Aug 23, 2023

Copy link
Copy Markdown
Member

However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like.

I agree. Perhaps the options which are frequently used by ILC, e.g. from obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp file when we PublishAot a console app.

Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

I think the original and generated rsp files are not comparable easily. Moreover, if we want to also verify that the repro package actually works, we can do something similar to:

  • dotnet publish -p:PublishAot=true a console app to auto-generate the RSP file under obj/ dir (so we don't need to worry about keeping it in sync with moving target)
  • Append --make-repro-path line to aot.ilc.rsp
  • Execute ilc @"obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp"
  • Extract the package in repro1/
  • Insert --make-repro-path line in repro1's repro.rsp and run ilc @repro.rsp (working directory needs to be the extraction location)
  • Extract the second package in repro2/
  • Insert --make-repro-path line in repro2's repro.rsp
  • Compare if the extracted RSP files match (produce zero diffs)

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

That sounds good, however I am not sure where would such test be placed (we had similar discussions around build/running ios test apps, which ended up being treated as functional tests - sharing the Mono setup).

@MichalStrehovsky what do you think?

@jkotas

jkotas commented Aug 23, 2023

Copy link
Copy Markdown
Member

dotnet/runtime repo does not have a good place for tests that exercise E2E tool flows. A good place to add a test like this one would be the SDK repo (see https://github.com/dotnet/sdk/blob/364773edba30d46ac95e3b32c08f46168e96bd35/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs for prior art).

@jkotas
jkotas merged commit 3ef2c80 into dotnet:mainAug 23, 2023
@jkotas

Copy link
Copy Markdown
Member

/backport to release/8.0

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5952974913

@jkotas

Copy link
Copy Markdown
Member

test

Opened #91013

@ivanpovazan
ivanpovazan deleted the fix-make-repro branch August 28, 2023 10:32
@ghostghost locked as resolved and limited conversation to collaborators Sep 27, 2023
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.

3 participants

@ivanpovazan@am11@jkotas
, '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('^' + ".*" + ' [NativeAOT] Fix `--make-repro-path` ILC option by ivanpovazan · Pull Request #90935 · dotnet/runtime · GitHub
Skip to content

[NativeAOT] Fix --make-repro-path ILC option - #90935

Merged
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro
Aug 23, 2023
Merged

[NativeAOT] Fix --make-repro-path ILC option#90935
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro

Conversation

@ivanpovazan

Copy link
Copy Markdown
Member

This PR fixes a regression with --make-repro-path command line option which was caused by upgrading the System.CommandLine version in: #84229

The issue is related to the fact that CliOption.Name now includes -- (eg: option.Name == --targetos:OSX) causing --make-repro-path to generate extra hyphens in the repro.rsp file, for example:

----reference:0/WindowsBase.dll
----reference:1/System.Private.CoreLib.dll
----reference:2/System.Private.DisabledReflection.dll
...

Tested manually by:

  1. Creating a repro.zip by including the --make-repro-path option during compilation
  2. Unzipping the repro.zip
  3. Compiling the assemblies from the unzipped folder by passing the generated repro.rsp

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

/cc: @am11

@am11am11 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

@am11

am11 commented Aug 22, 2023

Copy link
Copy Markdown
Member

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

No worries, I accidentally bumped into this. As you rightfully suggested:

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

it would be great to have a test, so we catch this kind of unintentional regressions. However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like. Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

@am11

am11 commented Aug 23, 2023

Copy link
Copy Markdown
Member

However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like.

I agree. Perhaps the options which are frequently used by ILC, e.g. from obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp file when we PublishAot a console app.

Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

I think the original and generated rsp files are not comparable easily. Moreover, if we want to also verify that the repro package actually works, we can do something similar to:

  • dotnet publish -p:PublishAot=true a console app to auto-generate the RSP file under obj/ dir (so we don't need to worry about keeping it in sync with moving target)
  • Append --make-repro-path line to aot.ilc.rsp
  • Execute ilc @"obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp"
  • Extract the package in repro1/
  • Insert --make-repro-path line in repro1's repro.rsp and run ilc @repro.rsp (working directory needs to be the extraction location)
  • Extract the second package in repro2/
  • Insert --make-repro-path line in repro2's repro.rsp
  • Compare if the extracted RSP files match (produce zero diffs)

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

That sounds good, however I am not sure where would such test be placed (we had similar discussions around build/running ios test apps, which ended up being treated as functional tests - sharing the Mono setup).

@MichalStrehovsky what do you think?

@jkotas

jkotas commented Aug 23, 2023

Copy link
Copy Markdown
Member

dotnet/runtime repo does not have a good place for tests that exercise E2E tool flows. A good place to add a test like this one would be the SDK repo (see https://github.com/dotnet/sdk/blob/364773edba30d46ac95e3b32c08f46168e96bd35/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs for prior art).

@jkotas
jkotas merged commit 3ef2c80 into dotnet:mainAug 23, 2023
@jkotas

Copy link
Copy Markdown
Member

/backport to release/8.0

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5952974913

@jkotas

Copy link
Copy Markdown
Member

test

Opened #91013

@ivanpovazan
ivanpovazan deleted the fix-make-repro branch August 28, 2023 10:32
@ghostghost locked as resolved and limited conversation to collaborators Sep 27, 2023
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.

3 participants

@ivanpovazan@am11@jkotas
, '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" + ' [NativeAOT] Fix `--make-repro-path` ILC option by ivanpovazan · Pull Request #90935 · dotnet/runtime · GitHub
Skip to content

[NativeAOT] Fix --make-repro-path ILC option - #90935

Merged
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro
Aug 23, 2023
Merged

[NativeAOT] Fix --make-repro-path ILC option#90935
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro

Conversation

@ivanpovazan

Copy link
Copy Markdown
Member

This PR fixes a regression with --make-repro-path command line option which was caused by upgrading the System.CommandLine version in: #84229

The issue is related to the fact that CliOption.Name now includes -- (eg: option.Name == --targetos:OSX) causing --make-repro-path to generate extra hyphens in the repro.rsp file, for example:

----reference:0/WindowsBase.dll
----reference:1/System.Private.CoreLib.dll
----reference:2/System.Private.DisabledReflection.dll
...

Tested manually by:

  1. Creating a repro.zip by including the --make-repro-path option during compilation
  2. Unzipping the repro.zip
  3. Compiling the assemblies from the unzipped folder by passing the generated repro.rsp

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

/cc: @am11

@am11am11 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

@am11

am11 commented Aug 22, 2023

Copy link
Copy Markdown
Member

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

No worries, I accidentally bumped into this. As you rightfully suggested:

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

it would be great to have a test, so we catch this kind of unintentional regressions. However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like. Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

@am11

am11 commented Aug 23, 2023

Copy link
Copy Markdown
Member

However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like.

I agree. Perhaps the options which are frequently used by ILC, e.g. from obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp file when we PublishAot a console app.

Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

I think the original and generated rsp files are not comparable easily. Moreover, if we want to also verify that the repro package actually works, we can do something similar to:

  • dotnet publish -p:PublishAot=true a console app to auto-generate the RSP file under obj/ dir (so we don't need to worry about keeping it in sync with moving target)
  • Append --make-repro-path line to aot.ilc.rsp
  • Execute ilc @"obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp"
  • Extract the package in repro1/
  • Insert --make-repro-path line in repro1's repro.rsp and run ilc @repro.rsp (working directory needs to be the extraction location)
  • Extract the second package in repro2/
  • Insert --make-repro-path line in repro2's repro.rsp
  • Compare if the extracted RSP files match (produce zero diffs)

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

That sounds good, however I am not sure where would such test be placed (we had similar discussions around build/running ios test apps, which ended up being treated as functional tests - sharing the Mono setup).

@MichalStrehovsky what do you think?

@jkotas

jkotas commented Aug 23, 2023

Copy link
Copy Markdown
Member

dotnet/runtime repo does not have a good place for tests that exercise E2E tool flows. A good place to add a test like this one would be the SDK repo (see https://github.com/dotnet/sdk/blob/364773edba30d46ac95e3b32c08f46168e96bd35/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs for prior art).

@jkotas
jkotas merged commit 3ef2c80 into dotnet:mainAug 23, 2023
@jkotas

Copy link
Copy Markdown
Member

/backport to release/8.0

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5952974913

@jkotas

Copy link
Copy Markdown
Member

test

Opened #91013

@ivanpovazan
ivanpovazan deleted the fix-make-repro branch August 28, 2023 10:32
@ghostghost locked as resolved and limited conversation to collaborators Sep 27, 2023
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.

3 participants

@ivanpovazan@am11@jkotas
, '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('^' + ".*" + ' [NativeAOT] Fix `--make-repro-path` ILC option by ivanpovazan · Pull Request #90935 · dotnet/runtime · GitHub
Skip to content

[NativeAOT] Fix --make-repro-path ILC option - #90935

Merged
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro
Aug 23, 2023
Merged

[NativeAOT] Fix --make-repro-path ILC option#90935
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro

Conversation

@ivanpovazan

Copy link
Copy Markdown
Member

This PR fixes a regression with --make-repro-path command line option which was caused by upgrading the System.CommandLine version in: #84229

The issue is related to the fact that CliOption.Name now includes -- (eg: option.Name == --targetos:OSX) causing --make-repro-path to generate extra hyphens in the repro.rsp file, for example:

----reference:0/WindowsBase.dll
----reference:1/System.Private.CoreLib.dll
----reference:2/System.Private.DisabledReflection.dll
...

Tested manually by:

  1. Creating a repro.zip by including the --make-repro-path option during compilation
  2. Unzipping the repro.zip
  3. Compiling the assemblies from the unzipped folder by passing the generated repro.rsp

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

/cc: @am11

@am11am11 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

@am11

am11 commented Aug 22, 2023

Copy link
Copy Markdown
Member

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

No worries, I accidentally bumped into this. As you rightfully suggested:

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

it would be great to have a test, so we catch this kind of unintentional regressions. However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like. Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

@am11

am11 commented Aug 23, 2023

Copy link
Copy Markdown
Member

However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like.

I agree. Perhaps the options which are frequently used by ILC, e.g. from obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp file when we PublishAot a console app.

Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

I think the original and generated rsp files are not comparable easily. Moreover, if we want to also verify that the repro package actually works, we can do something similar to:

  • dotnet publish -p:PublishAot=true a console app to auto-generate the RSP file under obj/ dir (so we don't need to worry about keeping it in sync with moving target)
  • Append --make-repro-path line to aot.ilc.rsp
  • Execute ilc @"obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp"
  • Extract the package in repro1/
  • Insert --make-repro-path line in repro1's repro.rsp and run ilc @repro.rsp (working directory needs to be the extraction location)
  • Extract the second package in repro2/
  • Insert --make-repro-path line in repro2's repro.rsp
  • Compare if the extracted RSP files match (produce zero diffs)

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

That sounds good, however I am not sure where would such test be placed (we had similar discussions around build/running ios test apps, which ended up being treated as functional tests - sharing the Mono setup).

@MichalStrehovsky what do you think?

@jkotas

jkotas commented Aug 23, 2023

Copy link
Copy Markdown
Member

dotnet/runtime repo does not have a good place for tests that exercise E2E tool flows. A good place to add a test like this one would be the SDK repo (see https://github.com/dotnet/sdk/blob/364773edba30d46ac95e3b32c08f46168e96bd35/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs for prior art).

@jkotas
jkotas merged commit 3ef2c80 into dotnet:mainAug 23, 2023
@jkotas

Copy link
Copy Markdown
Member

/backport to release/8.0

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5952974913

@jkotas

Copy link
Copy Markdown
Member

test

Opened #91013

@ivanpovazan
ivanpovazan deleted the fix-make-repro branch August 28, 2023 10:32
@ghostghost locked as resolved and limited conversation to collaborators Sep 27, 2023
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.

3 participants

@ivanpovazan@am11@jkotas
, '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('^' + ".*" + ' [NativeAOT] Fix `--make-repro-path` ILC option by ivanpovazan · Pull Request #90935 · dotnet/runtime · GitHub
Skip to content

[NativeAOT] Fix --make-repro-path ILC option - #90935

Merged
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro
Aug 23, 2023
Merged

[NativeAOT] Fix --make-repro-path ILC option#90935
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro

Conversation

@ivanpovazan

Copy link
Copy Markdown
Member

This PR fixes a regression with --make-repro-path command line option which was caused by upgrading the System.CommandLine version in: #84229

The issue is related to the fact that CliOption.Name now includes -- (eg: option.Name == --targetos:OSX) causing --make-repro-path to generate extra hyphens in the repro.rsp file, for example:

----reference:0/WindowsBase.dll
----reference:1/System.Private.CoreLib.dll
----reference:2/System.Private.DisabledReflection.dll
...

Tested manually by:

  1. Creating a repro.zip by including the --make-repro-path option during compilation
  2. Unzipping the repro.zip
  3. Compiling the assemblies from the unzipped folder by passing the generated repro.rsp

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

/cc: @am11

@am11am11 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

@am11

am11 commented Aug 22, 2023

Copy link
Copy Markdown
Member

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

No worries, I accidentally bumped into this. As you rightfully suggested:

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

it would be great to have a test, so we catch this kind of unintentional regressions. However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like. Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

@am11

am11 commented Aug 23, 2023

Copy link
Copy Markdown
Member

However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like.

I agree. Perhaps the options which are frequently used by ILC, e.g. from obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp file when we PublishAot a console app.

Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

I think the original and generated rsp files are not comparable easily. Moreover, if we want to also verify that the repro package actually works, we can do something similar to:

  • dotnet publish -p:PublishAot=true a console app to auto-generate the RSP file under obj/ dir (so we don't need to worry about keeping it in sync with moving target)
  • Append --make-repro-path line to aot.ilc.rsp
  • Execute ilc @"obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp"
  • Extract the package in repro1/
  • Insert --make-repro-path line in repro1's repro.rsp and run ilc @repro.rsp (working directory needs to be the extraction location)
  • Extract the second package in repro2/
  • Insert --make-repro-path line in repro2's repro.rsp
  • Compare if the extracted RSP files match (produce zero diffs)

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

That sounds good, however I am not sure where would such test be placed (we had similar discussions around build/running ios test apps, which ended up being treated as functional tests - sharing the Mono setup).

@MichalStrehovsky what do you think?

@jkotas

jkotas commented Aug 23, 2023

Copy link
Copy Markdown
Member

dotnet/runtime repo does not have a good place for tests that exercise E2E tool flows. A good place to add a test like this one would be the SDK repo (see https://github.com/dotnet/sdk/blob/364773edba30d46ac95e3b32c08f46168e96bd35/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs for prior art).

@jkotas
jkotas merged commit 3ef2c80 into dotnet:mainAug 23, 2023
@jkotas

Copy link
Copy Markdown
Member

/backport to release/8.0

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5952974913

@jkotas

Copy link
Copy Markdown
Member

test

Opened #91013

@ivanpovazan
ivanpovazan deleted the fix-make-repro branch August 28, 2023 10:32
@ghostghost locked as resolved and limited conversation to collaborators Sep 27, 2023
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.

3 participants

@ivanpovazan@am11@jkotas
, '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); } })(); })(); [NativeAOT] Fix `--make-repro-path` ILC option by ivanpovazan · Pull Request #90935 · dotnet/runtime · GitHub
Skip to content

[NativeAOT] Fix --make-repro-path ILC option - #90935

Merged
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro
Aug 23, 2023
Merged

[NativeAOT] Fix --make-repro-path ILC option#90935
jkotas merged 1 commit into
dotnet:mainfrom
ivanpovazan:fix-make-repro

Conversation

@ivanpovazan

Copy link
Copy Markdown
Member

This PR fixes a regression with --make-repro-path command line option which was caused by upgrading the System.CommandLine version in: #84229

The issue is related to the fact that CliOption.Name now includes -- (eg: option.Name == --targetos:OSX) causing --make-repro-path to generate extra hyphens in the repro.rsp file, for example:

----reference:0/WindowsBase.dll
----reference:1/System.Private.CoreLib.dll
----reference:2/System.Private.DisabledReflection.dll
...

Tested manually by:

  1. Creating a repro.zip by including the --make-repro-path option during compilation
  2. Unzipping the repro.zip
  3. Compiling the assemblies from the unzipped folder by passing the generated repro.rsp

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

/cc: @am11

@am11am11 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

@am11

am11 commented Aug 22, 2023

Copy link
Copy Markdown
Member

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

Thank you! In my mind, I was confident that I have tested this scenario when I sent out the PR, but apparently additional hyphens was not something I paid attention to. 🙈

No worries, I accidentally bumped into this. As you rightfully suggested:

@ivanpovazan, not for this PR, but do you think we can create a test for make-repro? e.g. build a command with many options and arguments and run it with make-repro, then extract the repro package, rerun the extracted command and compare results.

cc @adamsitnik

it would be great to have a test, so we catch this kind of unintentional regressions. However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like. Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

@am11

am11 commented Aug 23, 2023

Copy link
Copy Markdown
Member

However, covering all supported switches seems like a moving target, so not exactly sure what would the test look like.

I agree. Perhaps the options which are frequently used by ILC, e.g. from obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp file when we PublishAot a console app.

Additionally, would we just check whether the resulting repro.rsp is as expected, or a full successful compilation of a repro package would have to be used for verification?

I think the original and generated rsp files are not comparable easily. Moreover, if we want to also verify that the repro package actually works, we can do something similar to:

  • dotnet publish -p:PublishAot=true a console app to auto-generate the RSP file under obj/ dir (so we don't need to worry about keeping it in sync with moving target)
  • Append --make-repro-path line to aot.ilc.rsp
  • Execute ilc @"obj/$(Configuration)/$(TFM)/$(RID)/native/aot.ilc.rsp"
  • Extract the package in repro1/
  • Insert --make-repro-path line in repro1's repro.rsp and run ilc @repro.rsp (working directory needs to be the extraction location)
  • Extract the second package in repro2/
  • Insert --make-repro-path line in repro2's repro.rsp
  • Compare if the extracted RSP files match (produce zero diffs)

@ivanpovazan

Copy link
Copy Markdown
MemberAuthor

That sounds good, however I am not sure where would such test be placed (we had similar discussions around build/running ios test apps, which ended up being treated as functional tests - sharing the Mono setup).

@MichalStrehovsky what do you think?

@jkotas

jkotas commented Aug 23, 2023

Copy link
Copy Markdown
Member

dotnet/runtime repo does not have a good place for tests that exercise E2E tool flows. A good place to add a test like this one would be the SDK repo (see https://github.com/dotnet/sdk/blob/364773edba30d46ac95e3b32c08f46168e96bd35/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs for prior art).

@jkotas
jkotas merged commit 3ef2c80 into dotnet:mainAug 23, 2023
@jkotas

Copy link
Copy Markdown
Member

/backport to release/8.0

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/5952974913

@jkotas

Copy link
Copy Markdown
Member

test

Opened #91013

@ivanpovazan
ivanpovazan deleted the fix-make-repro branch August 28, 2023 10:32
@ghostghost locked as resolved and limited conversation to collaborators Sep 27, 2023
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.

3 participants

@ivanpovazan@am11@jkotas