From ad4a7e32f3c859ecacd2f73ff429ad8e724dbdfc Mon Sep 17 00:00:00 2001
From: Christian Gmeiner <cgmeiner@igalia.com>
Date: Wed, 24 Jul 2024 14:30:09 +0200
Subject: [PATCH] nak: Move cfg to compiler crate

Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30443>
---
 src/{nouveau/compiler/nak => compiler/rust}/cfg.rs | 2 +-
 src/compiler/rust/lib.rs                           | 1 +
 src/compiler/rust/meson.build                      | 1 +
 src/nouveau/compiler/nak/from_nir.rs               | 2 +-
 src/nouveau/compiler/nak/hw_tests.rs               | 2 +-
 src/nouveau/compiler/nak/ir.rs                     | 2 +-
 src/nouveau/compiler/nak/lib.rs                    | 1 -
 src/nouveau/compiler/nak/opt_jump_thread.rs        | 2 +-
 src/nouveau/compiler/nak/to_cssa.rs                | 2 +-
 9 files changed, 8 insertions(+), 7 deletions(-)
 rename src/{nouveau/compiler/nak => compiler/rust}/cfg.rs (99%)

diff --git a/src/nouveau/compiler/nak/cfg.rs b/src/compiler/rust/cfg.rs
similarity index 99%
rename from src/nouveau/compiler/nak/cfg.rs
rename to src/compiler/rust/cfg.rs
index a0e706d081f..6ce34cf348f 100644
--- a/src/nouveau/compiler/nak/cfg.rs
+++ b/src/compiler/rust/cfg.rs
@@ -1,7 +1,7 @@
 // Copyright © 2023 Collabora, Ltd.
 // SPDX-License-Identifier: MIT
 
-use compiler::bitset::BitSet;
+use crate::bitset::BitSet;
 use std::collections::HashMap;
 use std::hash::Hash;
 use std::ops::{Deref, DerefMut, Index, IndexMut};
diff --git a/src/compiler/rust/lib.rs b/src/compiler/rust/lib.rs
index aad58286fc4..ae2f0e90cdf 100644
--- a/src/compiler/rust/lib.rs
+++ b/src/compiler/rust/lib.rs
@@ -2,3 +2,4 @@
 // SPDX-License-Identifier: MIT
 
 pub mod bitset;
+pub mod cfg;
diff --git a/src/compiler/rust/meson.build b/src/compiler/rust/meson.build
index 5aae47685d7..a766ed97ab9 100644
--- a/src/compiler/rust/meson.build
+++ b/src/compiler/rust/meson.build
@@ -3,6 +3,7 @@
 
 _compiler_rs_sources = [
   'bitset.rs',
+  'cfg.rs',
 ]
 
 _compiler_rs_sources = structured_sources([
diff --git a/src/nouveau/compiler/nak/from_nir.rs b/src/nouveau/compiler/nak/from_nir.rs
index 4049ccb25c0..d570a221390 100644
--- a/src/nouveau/compiler/nak/from_nir.rs
+++ b/src/nouveau/compiler/nak/from_nir.rs
@@ -6,7 +6,6 @@
 use crate::api::GetDebugFlags;
 use crate::api::DEBUG;
 use crate::builder::*;
-use crate::cfg::CFGBuilder;
 use crate::ir::*;
 use crate::nir::*;
 use crate::nir_instr_printer::NirInstrPrinter;
@@ -14,6 +13,7 @@ use crate::sph::{OutputTopology, PixelImap};
 
 use nak_bindings::*;
 
+use compiler::cfg::CFGBuilder;
 use std::cmp::max;
 use std::collections::{HashMap, HashSet};
 use std::ops::Index;
diff --git a/src/nouveau/compiler/nak/hw_tests.rs b/src/nouveau/compiler/nak/hw_tests.rs
index 4ebd00df2c0..86822464154 100644
--- a/src/nouveau/compiler/nak/hw_tests.rs
+++ b/src/nouveau/compiler/nak/hw_tests.rs
@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: MIT
 
 use crate::api::{GetDebugFlags, ShaderBin, DEBUG};
-use crate::cfg::CFGBuilder;
 use crate::hw_runner::{Runner, CB0};
 use crate::ir::*;
 use crate::sm50::ShaderModel50;
 use crate::sm70::ShaderModel70;
 
 use acorn::Acorn;
+use compiler::cfg::CFGBuilder;
 use nak_bindings::*;
 use std::str::FromStr;
 use std::sync::OnceLock;
diff --git a/src/nouveau/compiler/nak/ir.rs b/src/nouveau/compiler/nak/ir.rs
index 06bfd2d6d9d..95cd69ea4d6 100644
--- a/src/nouveau/compiler/nak/ir.rs
+++ b/src/nouveau/compiler/nak/ir.rs
@@ -8,9 +8,9 @@ use bitview::{BitMutView, BitView};
 use nak_bindings::*;
 
 pub use crate::builder::{Builder, InstrBuilder, SSABuilder, SSAInstrBuilder};
-use crate::cfg::CFG;
 use crate::legalize::LegalizeBuilder;
 use crate::sph::{OutputTopology, PixelImap};
+use compiler::cfg::CFG;
 use nak_ir_proc::*;
 use std::cmp::{max, min};
 use std::fmt;
diff --git a/src/nouveau/compiler/nak/lib.rs b/src/nouveau/compiler/nak/lib.rs
index 9748fbf551b..2955445cccb 100644
--- a/src/nouveau/compiler/nak/lib.rs
+++ b/src/nouveau/compiler/nak/lib.rs
@@ -5,7 +5,6 @@ mod api;
 mod assign_regs;
 mod builder;
 mod calc_instr_deps;
-mod cfg;
 mod from_nir;
 mod ir;
 mod legalize;
diff --git a/src/nouveau/compiler/nak/opt_jump_thread.rs b/src/nouveau/compiler/nak/opt_jump_thread.rs
index 73a837197fd..da4b2ed8187 100644
--- a/src/nouveau/compiler/nak/opt_jump_thread.rs
+++ b/src/nouveau/compiler/nak/opt_jump_thread.rs
@@ -1,8 +1,8 @@
 // Copyright © 2023 Mel Henning
 // SPDX-License-Identifier: MIT
 
-use crate::cfg::CFGBuilder;
 use crate::ir::*;
+use compiler::cfg::CFGBuilder;
 use std::collections::HashMap;
 
 fn clone_branch(op: &Op) -> Op {
diff --git a/src/nouveau/compiler/nak/to_cssa.rs b/src/nouveau/compiler/nak/to_cssa.rs
index 5caffc1df68..a8a02875287 100644
--- a/src/nouveau/compiler/nak/to_cssa.rs
+++ b/src/nouveau/compiler/nak/to_cssa.rs
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: MIT
 
 use crate::api::{GetDebugFlags, DEBUG};
-use crate::cfg::CFG;
 use crate::ir::*;
 use crate::liveness::{BlockLiveness, Liveness, SimpleLiveness};
 
+use compiler::cfg::CFG;
 use std::collections::HashMap;
 use std::iter::Peekable;