Parse run commands

cranelift/filetests/filetests/isa/x86/simd-lane-access-run.clif

@@ -177,7 +177,7 @@ block0:
     v5 = vall_true v4
     return v5
 }
-; run:
+; run
 
 function %swizzle_with_overflow() -> b1 {
 block0:
@@ -190,4 +190,4 @@ block0:
     v5 = vall_true v4
     return v5
 }
-; run:
+; run

cranelift/filetests/src/test_run.rs

@@ -6,7 +6,9 @@ use crate::function_runner::FunctionRunner;
 use crate::subtest::{Context, SubTest, SubtestResult};
 use cranelift_codegen;
 use cranelift_codegen::ir;
+use cranelift_reader::parse_run_command;
 use cranelift_reader::TestCommand;
+use log::trace;
 use std::borrow::Cow;
 
 struct TestRun;
@@ -36,6 +38,12 @@ impl SubTest for TestRun {
     fn run(&self, func: Cow<ir::Function>, context: &Context) -> SubtestResult<()> {
         for comment in context.details.comments.iter() {
             if comment.text.contains("run") {
+                let trimmed_comment = comment.text.trim_start_matches(|c| c == ' ' || c == ';');
+                let command = parse_run_command(trimmed_comment, &func.signature)
+                    .map_err(|e| format!("{}", e))?;
+                trace!("Parsed run command: {}", command);
+                // TODO in following changes we will use the parsed command to alter FunctionRunner's behavior.
+
                 let runner =
                     FunctionRunner::with_host_isa(func.clone().into_owned(), context.flags.clone());
                 runner.run()?

cranelift/reader/src/lexer.rs

@@ -43,7 +43,7 @@ pub enum Token<'a> {
     SigRef(u32),          // sig2
     UserRef(u32),         // u345
     Name(&'a str),        // %9arbitrary_alphanum, %x3, %0, %function ...
-    String(&'a str),      // "abritrary quoted string with no escape" ...
+    String(&'a str),      // "arbitrary quoted string with no escape" ...
     HexSequence(&'a str), // #89AF
     Identifier(&'a str),  // Unrecognized identifier (opcode, enumerator, ...)
     SourceLoc(&'a str),   // @00c7

cranelift/reader/src/lib.rs

@@ -28,7 +28,8 @@
 
 pub use crate::error::{Location, ParseError, ParseResult};
 pub use crate::isaspec::{parse_options, IsaSpec};
-pub use crate::parser::{parse_functions, parse_test, ParseOptions};
+pub use crate::parser::{parse_functions, parse_run_command, parse_test, ParseOptions};
+pub use crate::run_command::{Comparison, DataValue, Invocation, RunCommand};
 pub use crate::sourcemap::SourceMap;
 pub use crate::testcommand::{TestCommand, TestOption};
 pub use crate::testfile::{Comment, Details, Feature, TestFile};
@@ -37,6 +38,7 @@ mod error;
 mod isaspec;
 mod lexer;
 mod parser;
+mod run_command;
 mod sourcemap;
 mod testcommand;
 mod testfile;