Added enviroment setup tool.

FractalFir · FractalFir · commit 0b45a56de69f · 2023-12-29T10:57:39.000+01:00
diff --git a/cargo_tests/build_std/src/main.rs b/cargo_tests/build_std/src/main.rs
@@ -110,7 +110,7 @@ fn main() {
     //let mut f = std::fs::File::create("foo.txt").unwrap();
 
     //std::hint::black_box(f);
-    std::io::stdout().write_all(b"hello world\n").unwrap();
+    //std::io::stdout().write_all(b"hello world\n").unwrap();
     let s = format!("Hello {}\0",8);
     unsafe{puts(s.as_ptr())};
    
diff --git a/src/assembly.rs b/src/assembly.rs
@@ -10,6 +10,7 @@ use crate::{
     r#type::TypeDef,
     IString,
 };
+use crate::rustc_middle::dep_graph::DepContext;
 use rustc_middle::mir::{
     interpret::{AllocId, GlobalAlloc},
     mono::MonoItem,
@@ -233,6 +234,7 @@ impl Assembly {
         name: &str,
         cache: &mut TyCache,
     ) -> Result<(), MethodCodegenError> {
+        
         if crate::utilis::is_function_magic(name) {
             return Ok(());
         }
@@ -469,20 +471,22 @@ impl Assembly {
             MonoItem::Fn(instance) => {
                 //let instance = crate::utilis::monomorphize(&instance,tcx);
                 let symbol_name = crate::utilis::function_name(item.symbol_name(tcx));
-
+                let function_compile_timer = tcx.profiler().generic_activity_with_arg("compile function",item.symbol_name(tcx).to_string());
                 self.checked_add_fn(instance, tcx, &symbol_name, cache)
                     .expect("Could not add function!");
-
+                drop(function_compile_timer);
                 Ok(())
             }
             MonoItem::GlobalAsm(asm) => {
                 eprintln!("Unsuported item - Global ASM:{asm:?}");
                 Ok(())
             }
             MonoItem::Static(stotic) => {
+                let static_compile_timer = tcx.profiler().generic_activity_with_arg("compile static initializer",item.symbol_name(tcx).to_string());
                 let alloc = tcx.eval_static_initializer(stotic).unwrap();
                 let alloc_id = tcx.reserve_and_set_memory_alloc(alloc);
                 self.add_allocation(crate::utilis::alloc_id_to_u64(alloc_id), tcx);
+                drop(static_compile_timer);
                 //eprintln!("Unsuported item - Static:{stotic:?}");
                 Ok(())
             }
diff --git a/src/bin/rustflags.rs b/src/bin/rustflags.rs
@@ -0,0 +1,27 @@
+fn main(){
+    let build_env = rustc_codegen_clr::compile_test::cargo_build_env();
+    println!("In order to compile cargo crates with `rustc_codegen_clr`, please set the RUSTFLAGS enviorment variable to:");
+    println!();
+    println!("\"{build_env}\"");
+    println!();
+    println!("On linux, you may use the following commmand to quickly set the required enviroment variables:");
+    println!();
+    println!("export RUSTFLAGS=\"{build_env}\"");
+    println!();
+    println!("On windows(powershell), you may use the following commmand to quickly set the required enviroment variables:");
+    println!();
+    println!("$Env:RUSTFLAGS = '{build_env}'");
+    println!();
+    println!("After you are done working with `rustc_codegen_clr` either unset the enviroment variable OR restart your shell(close the command prompt window).");
+    println!("On linux, you may use the following commmand to quickly unset the required enviroment variables:");
+    println!();
+    println!("unset RUSTFLAGS");
+    println!();
+    println!("Please note that those varaibles may change when the codegen is updated/rebuilt.");
+    println!("After each time the codegen is rebuilt, please use this tool again to get updated build enviroment variables.");
+    println!();
+    println!("If you are using the project, please remember to:");
+    println!("1. Update BOTH rustc and the project on a regular basis.");
+    println!("2. Report compiler bugs to the maintainers of `rustc_codegen_clr` not the maintainers of the compiler as a whole.");
+    println!("  In 99.999% of the cases, the bug is wihin this project and not the compiler.");
+}
diff --git a/src/cil/call_site.rs b/src/cil/call_site.rs
@@ -72,7 +72,7 @@ impl CallSite {
         if self.class().is_some() {
             return false;
         };
-        if self.name.as_ref() != "black_box" && self.name.as_ref() != "assert_inhabited"{
+        if self.name.as_ref() != "black_box" && self.name.as_ref() != "assert_inhabited" {
             return false;
         };
         if self.signature.inputs().len() != 1 {
diff --git a/src/compile_test.rs b/src/compile_test.rs
@@ -301,13 +301,7 @@ macro_rules! cargo_test {
                 // Ensures the test directory is present
                 std::fs::create_dir_all(test_dir).expect("Could not setup the test env");
                 // Builds the backend if neceasry
-                super::RUSTC_BUILD_STATUS
-                    .as_ref()
-                    .expect("Could not build rustc!");
-                let backend = super::absolute_backend_path();
-                let backend = backend.display();
-                let linker = super::RUSTC_CODEGEN_CLR_LINKER.display();
-                let rustflags = format!("-Z codegen-backend={backend} -C linker={linker}");
+                let rustflags = super::cargo_build_env();
                 // Compiles the test project
                 let out = std::process::Command::new("cargo")
                     .env("RUSTFLAGS", &rustflags)
@@ -342,13 +336,7 @@ macro_rules! cargo_test {
                 // Ensures the test directory is present
                 std::fs::create_dir_all(test_dir).expect("Could not setup the test env");
                 // Builds the backend if neceasry
-                super::RUSTC_BUILD_STATUS
-                    .as_ref()
-                    .expect("Could not build rustc!");
-                let backend = super::absolute_backend_path();
-                let backend = backend.display();
-                let linker = super::RUSTC_CODEGEN_CLR_LINKER.display();
-                let rustflags = format!("-Z codegen-backend={backend} -C linker={linker}");
+                let rustflags = super::cargo_build_env();
                 // Compiles the test project
                 let mut command = std::process::Command::new("cargo");
                 command
@@ -395,14 +383,8 @@ macro_rules! cargo_test_ignored {
                 let test_dir = concat!("./cargo_tests/", stringify!($test_name), "/");
                 // Ensures the test directory is present
                 std::fs::create_dir_all(test_dir).expect("Could not setup the test env");
-                // Builds the backend if neceasry
-                super::RUSTC_BUILD_STATUS
-                    .as_ref()
-                    .expect("Could not build rustc!");
-                let backend = super::absolute_backend_path();
-                let backend = backend.display();
-                let linker = super::RUSTC_CODEGEN_CLR_LINKER.display();
-                let rustflags = format!("-Z codegen-backend={backend} -C linker={linker}");
+    
+                let rustflags = super::cargo_build_env();
                 // Compiles the test project
                 let out = std::process::Command::new("cargo")
                     .env("RUSTFLAGS", &rustflags)
@@ -437,14 +419,8 @@ macro_rules! cargo_test_ignored {
                 let test_dir = concat!("./cargo_tests/", stringify!($test_name), "/");
                 // Ensures the test directory is present
                 std::fs::create_dir_all(test_dir).expect("Could not setup the test env");
-                // Builds the backend if neceasry
-                super::RUSTC_BUILD_STATUS
-                    .as_ref()
-                    .expect("Could not build rustc!");
-                let backend = super::absolute_backend_path();
-                let backend = backend.display();
-                let linker = super::RUSTC_CODEGEN_CLR_LINKER.display();
-                let rustflags = format!("-Z codegen-backend={backend} -C linker={linker}");
+
+                let rustflags = super::cargo_build_env();
                 // Compiles the test project
                 let mut command = std::process::Command::new("cargo");
                 command
@@ -505,7 +481,6 @@ fn build_backend() -> Result<(), String> {
         .expect("could not build the backend");
     Ok(())
 }
-#[cfg(test)]
 fn absolute_backend_path() -> PathBuf {
     if cfg!(debug_assertions) {
         if cfg!(target_os = "linux") {
@@ -664,3 +639,12 @@ lazy_static! {
 
     };
 }
+pub fn cargo_build_env()->String{
+    RUSTC_BUILD_STATUS
+    .as_ref()
+    .expect("Could not build rustc!");
+    let backend = absolute_backend_path();
+    let backend = backend.display();
+    let linker = RUSTC_CODEGEN_CLR_LINKER.display();
+    format!("-Z codegen-backend={backend} -C linker={linker}")
+}
diff --git a/src/lib.rs b/src/lib.rs
@@ -110,7 +110,7 @@ pub mod cil;
 /// Runtime errors and utlity functions/macros related to them
 mod codegen_error;
 /// Test harnesses.
-mod compile_test;
+pub mod compile_test;
 /// Code handling loading constant values in CIL.
 mod constant;
 /// Code detecting and inserting wrappers around entrypoints.
@@ -165,7 +165,7 @@ use rustc_session::{
     Session,
 };
 use rustc_span::ErrorGuaranteed;
-
+use crate::rustc_middle::dep_graph::DepContext;
 use std::{
     any::Any,
     path::{Path, PathBuf},
@@ -223,7 +223,9 @@ impl CodegenBackend for MyBackend {
             codegen.opt();
             // Done twice for inlining!
             codegen.opt();
+            let ffi_compile_timer = tcx.profiler(). generic_activity("insert .NET FFI functions/types");
             ffi::insert_ffi_functions(&mut codegen, tcx);
+            drop(ffi_compile_timer);
             let name: IString = cgus.iter().next().unwrap().name().to_string().into();
 
             Box::new((
diff --git a/src/type/tycache.rs b/src/type/tycache.rs
@@ -424,6 +424,8 @@ pub fn ty_generic_arg(ty: Ty) -> GenericArg {
 // but it might not be.
 
 fn try_find_ptr_components(ctx: TyCtxt) -> DefId {
+    use crate::rustc_middle::dep_graph::DepContext;
+    let find_ptr_components_timer = ctx.profiler(). generic_activity("ptr::metadata::PtrComponents");
     use rustc_middle::middle::exported_symbols::ExportedSymbol;
     let mut core = None;
     for krate in ctx.crates(()) {
@@ -464,10 +466,12 @@ fn try_find_ptr_components(ctx: TyCtxt) -> DefId {
                 "Found more than one defintin of PtrComponents"
             );
             ptr_components = Some(did);
+            break;
         }
 
         //44548
     }
     //todo!("core:{core:?} max_index:{max_index:?} ptr_components:{ptr_components:?}");
+    drop(find_ptr_components_timer);
     ptr_components.expect("Could not find core::ptr::metadata::PtrComponents")
 }

Original file line number	Diff line number	Diff line change
`@@ -424,6 +424,8 @@ pub fn ty_generic_arg(ty: Ty) -> GenericArg {`
`424`	`424`	`// but it might not be.`
`425`	`425`
`426`	`426`	`fn try_find_ptr_components(ctx: TyCtxt) -> DefId {`
	`427`	`+ use crate::rustc_middle::dep_graph::DepContext;`
	`428`	`+ let find_ptr_components_timer = ctx.profiler(). generic_activity("ptr::metadata::PtrComponents");`
`427`	`429`	`use rustc_middle::middle::exported_symbols::ExportedSymbol;`
`428`	`430`	`let mut core = None;`
`429`	`431`	`for krate in ctx.crates(()) {`
`@@ -464,10 +466,12 @@ fn try_find_ptr_components(ctx: TyCtxt) -> DefId {`
`464`	`466`	`"Found more than one defintin of PtrComponents"`
`465`	`467`	`);`
`466`	`468`	`ptr_components = Some(did);`
	`469`	`+ break;`
`467`	`470`	`}`
`468`	`471`
`469`	`472`	`//44548`
`470`	`473`	`}`
`471`	`474`	`//todo!("core:{core:?} max_index:{max_index:?} ptr_components:{ptr_components:?}");`
	`475`	`+ drop(find_ptr_components_timer);`
`472`	`476`	`ptr_components.expect("Could not find core::ptr::metadata::PtrComponents")`
`473`	`477`	`}`