From 95e72db458787cfe78169c56e64004e22aa0e45b Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Fri, 5 Aug 2022 13:25:24 -0700
Subject: [PATCH] Some little Cranelift logging things (#4624)

* Cranelift: Don't print "skipped TEST can't run aarch64" on x64, etc

It's way too noisy. Move it to the logs.

* Cranelift: Enable Cranelift trace logs in `clif-util` by default

* cranelift-filetest: use `log::warn!` for warnings

Instead of `println!`

* rustfmt
---
 cranelift/Cargo.toml                | 2 +-
 cranelift/filetests/src/runone.rs   | 6 ++++--
 cranelift/filetests/src/test_run.rs | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cranelift/Cargo.toml b/cranelift/Cargo.toml
index a783ff58b8..d4b728392f 100644
--- a/cranelift/Cargo.toml
+++ b/cranelift/Cargo.toml
@@ -43,7 +43,7 @@ anyhow = "1.0.32"
 clap = { version = "3.2.0", features = ["derive"] }
 
 [features]
-default = ["disas", "wasm", "cranelift-codegen/all-arch", "souper-harvest"]
+default = ["disas", "wasm", "cranelift-codegen/all-arch", "cranelift-codegen/trace-log", "souper-harvest"]
 disas = ["capstone"]
 wasm = ["wat", "cranelift-wasm"]
 souper-harvest = ["cranelift-codegen/souper-harvest", "rayon"]
diff --git a/cranelift/filetests/src/runone.rs b/cranelift/filetests/src/runone.rs
index 51df597586..fc8df54470 100644
--- a/cranelift/filetests/src/runone.rs
+++ b/cranelift/filetests/src/runone.rs
@@ -41,9 +41,11 @@ pub fn run(
         Ok(testfile) => testfile,
         Err(e) => {
             if e.is_warning {
-                println!(
+                log::warn!(
                     "skipping test {:?} (line {}): {}",
-                    path, e.location.line_number, e.message
+                    path,
+                    e.location.line_number,
+                    e.message
                 );
                 return Ok(started.elapsed());
             }
diff --git a/cranelift/filetests/src/test_run.rs b/cranelift/filetests/src/test_run.rs
index 24d0a3452a..4abaa53e64 100644
--- a/cranelift/filetests/src/test_run.rs
+++ b/cranelift/filetests/src/test_run.rs
@@ -114,7 +114,7 @@ impl SubTest for TestRun {
         let host_isa = build_host_isa(true, context.flags.clone(), vec![]);
         let requested_isa = context.isa.unwrap();
         if let Err(e) = is_isa_compatible(context, host_isa.as_ref(), requested_isa) {
-            println!("{}", e);
+            log::info!("{}", e);
             return Ok(());
         }