From 3534f80711551ed26bdb2ad97b4354bf6ee6fc72 Mon Sep 17 00:00:00 2001
From: TIHan <lol.tihan@gmail.com>
Date: Thu, 7 Sep 2023 14:15:27 -0700
Subject: [PATCH] Feedback. Fix pmi libraries collections

---
 .../coreclr/templates/run-superpmi-collect-job.yml     |  5 +----
 src/coreclr/inc/jiteeversionguid.h                     | 10 +++++-----
 src/coreclr/scripts/superpmi.py                        |  6 +++++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/eng/pipelines/coreclr/templates/run-superpmi-collect-job.yml b/eng/pipelines/coreclr/templates/run-superpmi-collect-job.yml
index a34322283a2bf..a4c61131b2651 100644
--- a/eng/pipelines/coreclr/templates/run-superpmi-collect-job.yml
+++ b/eng/pipelines/coreclr/templates/run-superpmi-collect-job.yml
@@ -100,10 +100,7 @@ jobs:
     - ${{ if eq(parameters.collectionName, 'libraries_tests') }}:
       - name: InputDirectory
         value: '$(Build.SourcesDirectory)/artifacts/tests/libraries/$(osGroup).$(archType).$(buildConfigUpper)'
-    - ${{ if and(eq(parameters.collectionName, 'smoke_tests'), eq(parameters.osGroup, 'windows')) }}:
-      - name: InputDirectory
-        value: '$(Build.SourcesDirectory)\artifacts\tests\coreclr\obj\${{ parameters.osGroup }}.${{ parameters.archType }}.${{ parameters.buildConfig }}\Managed\nativeaot\SmokeTests'
-    - ${{ if and(eq(parameters.collectionName, 'smoke_tests'), ne(parameters.osGroup, 'windows')) }}:
+    - ${{ if and(eq(parameters.collectionName, 'smoke_tests') }}:
       - name: InputDirectory
         value: '$(Build.SourcesDirectory)/artifacts/tests/coreclr/obj/${{ parameters.osGroup }}.${{ parameters.archType }}.$(buildConfigUpper)/Managed/nativeaot/SmokeTests'
 
diff --git a/src/coreclr/inc/jiteeversionguid.h b/src/coreclr/inc/jiteeversionguid.h
index e9e908cb5a2bf..70960ff577ee8 100644
--- a/src/coreclr/inc/jiteeversionguid.h
+++ b/src/coreclr/inc/jiteeversionguid.h
@@ -43,11 +43,11 @@ typedef const GUID *LPCGUID;
 #define GUID_DEFINED
 #endif // !GUID_DEFINED
 
-constexpr GUID JITEEVersionIdentifier = { /* 43ca1203-3a26-4d8a-89ec-60a3654bb2ad */
-    0x43ca1203,
-    0x3a26,
-    0x4d8a,
-    {0x89, 0xec, 0x60, 0xa3, 0x65, 0x4b, 0xb2, 0xad}
+constexpr GUID JITEEVersionIdentifier = { /* a2974440-e8ee-4d95-9e6e-799a330be1a0 */
+    0xa2974440,
+    0xe8ee,
+    0x4d95,
+    {0x9e, 0x6e, 0x79, 0x9a, 0x33, 0x0b, 0xe1, 0xa0}
   };
   
 //////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/coreclr/scripts/superpmi.py b/src/coreclr/scripts/superpmi.py
index 6604ef04f1c91..fcd0dcc0a72d0 100644
--- a/src/coreclr/scripts/superpmi.py
+++ b/src/coreclr/scripts/superpmi.py
@@ -1137,6 +1137,10 @@ async def run_nativeaot(print_prefix, original_rsp_filepath, self):
                     if not original_rsp_filepath.endswith(".ilc.rsp"):
                         raise RuntimeError(f"Expected a '.ilc.rsp' file for nativeaot, but got {original_rsp_filepath}")
 
+                    # The contents of the rsp contain many knobs and arguments that represent customer scenarios.
+                    # Make a copy of the .ilc.rsp file as we are going to modify it. We do not want to modify the original one.
+                    # The modifications include re-writing paths for references, input assembly and the output.
+                    # We do this because the current paths in the rsp *may* not exist by the time we want to run ilc.
                     rsp_filepath = os.path.join(self.temp_location, make_safe_filename("nativeaot_" + original_rsp_filepath) + ".rsp")
                     shutil.copyfile(original_rsp_filepath, rsp_filepath)
 
@@ -4337,7 +4341,7 @@ def verify_base_diff_args():
             print("Specify `-assemblies` if `--pmi` or `--crossgen2` is given")
             sys.exit(1)
 
-        if ((args.pmi is True) or (args.nativeaot is True)) and (len(args.ilc_rsps) == 0):
+        if ((args.nativeaot is True)) and (len(args.ilc_rsps) == 0):
             print("Specify `-ilc_rsps` if `--nativeaot` is given")
             sys.exit(1)