From b37bb4bee0073464136bd4e3fad699a9be6f73d4 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Thu, 25 Jul 2013 16:09:04 -0400 Subject: [PATCH] nitg: add more info (for -v) Signed-off-by: Jean Privat --- src/abstract_compiler.nit | 3 ++- src/global_compiler.nit | 4 ++-- src/rapid_type_analysis.nit | 7 +++++++ src/separate_compiler.nit | 7 ++++++- src/separate_erasure_compiler.nit | 6 +++++- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/abstract_compiler.nit b/src/abstract_compiler.nit index 8fe53e5..d325439 100644 --- a/src/abstract_compiler.nit +++ b/src/abstract_compiler.nit @@ -102,6 +102,7 @@ redef class ModelBuilder # A single C file regroups many compiled rumtime functions # Note that we do not try to be clever an a small change in a Nit source file may change the content of all the generated .c files var time0 = get_time + self.toolcontext.info("*** WRITING C ***", 1) ".nit_compile".mkdir @@ -212,7 +213,7 @@ redef class ModelBuilder self.toolcontext.info("Generated makefile: {makename}", 2) var time1 = get_time - self.toolcontext.info("*** END COMPILING TO C: {time1-time0} ***", 2) + self.toolcontext.info("*** END WRITING C: {time1-time0} ***", 2) # Execute the Makefile diff --git a/src/global_compiler.nit b/src/global_compiler.nit index 7b3c944..cd2eaa2 100644 --- a/src/global_compiler.nit +++ b/src/global_compiler.nit @@ -33,7 +33,7 @@ redef class ModelBuilder fun run_global_compiler(mainmodule: MModule, runtime_type_analysis: RapidTypeAnalysis) do var time0 = get_time - self.toolcontext.info("*** COMPILING TO C ***", 1) + self.toolcontext.info("*** GENERATING C ***", 1) var compiler = new GlobalCompiler(mainmodule, self, runtime_type_analysis) compiler.compile_header @@ -68,7 +68,7 @@ redef class ModelBuilder compiler.display_stats var time1 = get_time - self.toolcontext.info("*** END VISITING: {time1-time0} ***", 2) + self.toolcontext.info("*** END GENERATING C: {time1-time0} ***", 2) write_and_make(compiler) end end diff --git a/src/rapid_type_analysis.nit b/src/rapid_type_analysis.nit index 6675dcd..8d31112 100644 --- a/src/rapid_type_analysis.nit +++ b/src/rapid_type_analysis.nit @@ -47,6 +47,9 @@ import auto_super_init redef class ModelBuilder fun do_rapid_type_analysis(mainmodule: MModule): RapidTypeAnalysis do + var time0 = get_time + self.toolcontext.info("*** RAPID TYPE ANALYSIS ***", 1) + var model = self.model var analysis = new RapidTypeAnalysis(self, mainmodule) var nmodule = self.nmodules.first @@ -62,6 +65,10 @@ redef class ModelBuilder analysis.add_monomorphic_send(maintype, mainprop) end analysis.run_analysis + + var time1 = get_time + self.toolcontext.info("*** END RAPID TYPE ANALYSIS: {time1-time0} ***", 2) + return analysis end end diff --git a/src/separate_compiler.nit b/src/separate_compiler.nit index 2a72e79..a2e5128 100644 --- a/src/separate_compiler.nit +++ b/src/separate_compiler.nit @@ -59,12 +59,13 @@ redef class ModelBuilder fun run_separate_compiler(mainmodule: MModule, runtime_type_analysis: RapidTypeAnalysis) do var time0 = get_time - self.toolcontext.info("*** COMPILING TO C ***", 1) + self.toolcontext.info("*** GENERATING C ***", 1) var compiler = new SeparateCompiler(mainmodule, self, runtime_type_analysis) compiler.compile_header # compile class structures + self.toolcontext.info("Property coloring", 2) compiler.new_file("{mainmodule.name}.classes") compiler.do_property_coloring for m in mainmodule.in_importation.greaters do @@ -79,11 +80,13 @@ redef class ModelBuilder # compile methods for m in mainmodule.in_importation.greaters do + self.toolcontext.info("Generate C for module {m}", 2) compiler.new_file("{m.name}.sep") compiler.compile_module_to_c(m) end # compile live & cast type structures + self.toolcontext.info("Type coloring", 2) compiler.new_file("{mainmodule.name}.types") var mtypes = compiler.do_type_coloring for t in mtypes do @@ -92,6 +95,8 @@ redef class ModelBuilder compiler.display_stats + var time1 = get_time + self.toolcontext.info("*** END GENERATING C: {time1-time0} ***", 2) write_and_make(compiler) end end diff --git a/src/separate_erasure_compiler.nit b/src/separate_erasure_compiler.nit index d8bb170..2b3d304 100644 --- a/src/separate_erasure_compiler.nit +++ b/src/separate_erasure_compiler.nit @@ -35,12 +35,13 @@ redef class ModelBuilder fun run_separate_erasure_compiler(mainmodule: MModule, runtime_type_analysis: RapidTypeAnalysis) do var time0 = get_time - self.toolcontext.info("*** COMPILING TO C ***", 1) + self.toolcontext.info("*** GENERATING C ***", 1) var compiler = new SeparateErasureCompiler(mainmodule, self, runtime_type_analysis) compiler.compile_header # compile class structures + self.toolcontext.info("Property coloring", 2) compiler.new_file("{mainmodule.name}.tables") compiler.do_property_coloring for m in mainmodule.in_importation.greaters do @@ -56,12 +57,15 @@ redef class ModelBuilder # compile methods for m in mainmodule.in_importation.greaters do + self.toolcontext.info("Generate C for module {m}", 2) compiler.new_file("{m.name}.sep") compiler.compile_module_to_c(m) end compiler.display_stats + var time1 = get_time + self.toolcontext.info("*** END GENERATING C: {time1-time0} ***", 2) write_and_make(compiler) end end -- 1.7.9.5