From 3837e3e6cecb8edbe3fdb2c73fb6cea6a8dc1a28 Mon Sep 17 00:00:00 2001
From: Amir Ayupov <aaupov@fb.com>
Date: Tue, 18 Jul 2023 19:43:08 -0700
Subject: [PATCH] [BOLT][Utils] Pass cmp-rev to nfc-check-setup

Pass the revision to checkout to (cmp-rev) as nfc-check-setup option.
Simpifies the comparison against arbitrary commit, not just the previous one.

Reviewed By: #bolt, rafauler

Differential Revision: https://reviews.llvm.org/D155657
---
 bolt/utils/nfc-check-setup.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bolt/utils/nfc-check-setup.py b/bolt/utils/nfc-check-setup.py
index b7b30a9296cb..710b18350585 100755
--- a/bolt/utils/nfc-check-setup.py
+++ b/bolt/utils/nfc-check-setup.py
@@ -42,6 +42,11 @@ def main():
         action="store_true",
         help="Checkout back to the starting revision",
     )
+    parser.add_argument(
+        "--cmp-rev",
+        default="HEAD^",
+        help="Revision to checkout to compare vs HEAD",
+    )
     args, wrapper_args = parser.parse_known_args()
     bolt_path = f"{args.build_dir}/bin/llvm-bolt"
 
@@ -77,8 +82,8 @@ def main():
     if stash:
         # save local changes before checkout
         subprocess.run(shlex.split("git stash push -u"), cwd=source_dir)
-    # check out the previous commit
-    subprocess.run(shlex.split("git checkout -f HEAD^"), cwd=source_dir)
+    # check out the previous/cmp commit
+    subprocess.run(shlex.split(f"git checkout -f {args.cmp_rev}"), cwd=source_dir)
     # get the parent commit hash for logging
     new_ref = get_git_ref_or_rev(source_dir)
     # build the previous commit