[RISCV] updated checker script to accept preprocessor commands

Signed-off-by: Luke Quinn <[email protected]>

Author: lquinn2015

llvm/utils/update_mir_test_checks.py

@@ -87,13 +87,14 @@ def __call__(self, args, ir):
 
 
 class Run:
-    def __init__(self, prefixes, cmd_args, triple):
+    def __init__(self, prefixes, cmd_args, preprocess_cmd, triple):
         self.prefixes = prefixes
         self.cmd_args = cmd_args
+        self.preprocess_cmd = preprocess_cmd
         self.triple = triple
 
     def __getitem__(self, index):
-        return [self.prefixes, self.cmd_args, self.triple][index]
+        return [self.prefixes, self.cmd_args, self.preprocess_cmd, self.triple][index]
 
 
 def log(msg, verbose=True):
@@ -117,9 +118,14 @@ def build_run_list(test, run_lines, verbose=False):
             common.warn("Skipping unparsable RUN line: " + l)
             continue
 
-        commands = [cmd.strip() for cmd in l.split("|", 1)]
-        llc_cmd = commands[0]
-        filecheck_cmd = commands[1] if len(commands) > 1 else ""
+        commands = [cmd.strip() for cmd in l.split("|")]
+        assert len(commands) >= 2 
+        preprocess_cmd = None 
+        if len(commands) > 2:
+            preprocess_cmd = " | ".join(commands[:-2])
+
+        llc_cmd = commands[-2]
+        filecheck_cmd = commands[-1]
         common.verify_filecheck_prefixes(filecheck_cmd)
 
         if not llc_cmd.startswith("llc "):
@@ -145,7 +151,7 @@ def build_run_list(test, run_lines, verbose=False):
         check_prefixes = common.get_check_prefixes(filecheck_cmd)
         all_prefixes += check_prefixes
 
-        run_list.append(Run(check_prefixes, cmd_args, triple))
+        run_list.append(Run(check_prefixes, cmd_args, preprocess_cmd, triple))
 
     # Sort prefixes that are shared between run lines before unshared prefixes.
     # This causes us to prefer printing shared prefixes.
@@ -358,11 +364,21 @@ def update_test_file(args, test, autogenerated_note):
     for run in run_list:
         for prefix in run.prefixes:
             func_dict.update({prefix: dict()})
-    for prefixes, llc_args, triple_in_cmd in run_list:
+    for prefixes, llc_args, preprocess_cmd, triple_in_cmd in run_list:
         log("Extracted LLC cmd: llc {}".format(llc_args), args.verbose)
         log("Extracted FileCheck prefixes: {}".format(prefixes), args.verbose)
 
-        raw_tool_output = args.llc_binary(llc_args, test)
+        if test.endswith(".mir"):
+            llc_args += " -x mir"
+
+        #raw_tool_output = args.llc_binary(llc_args, test)
+        raw_tool_output = common.invoke_tool(
+                "llc",
+                llc_args,
+                test,
+                preprocess_cmd,
+                verbose=args.verbose
+                )
         if not triple_in_cmd and not triple_in_ir:
             common.warn("No triple found: skipping file", test_file=test)
             return