From 4359a78d069050d64c410c3497b67cc7d600bc5d Mon Sep 17 00:00:00 2001 From: Zed Lopez Date: Mon, 16 May 2022 23:46:35 -0700 Subject: [PATCH] simoly -> simply --- .../Chapter 1/Supervisor Module.w | 2 +- inform7/Figures/memory-diagnostics.txt | 48 +++++++++---------- inform7/Figures/timings-diagnostics.txt | 31 ++++++------ .../Chapter 1/Assertions Module.w | 2 +- .../Chapter 1/Knowledge Module.w | 2 +- .../Chapter 1/Multimedia Module.w | 2 +- .../runtime-module/Chapter 1/Runtime Module.w | 2 +- .../values-module/Chapter 1/Values Module.w | 2 +- .../Chapter 1/Bytecode Module.w | 2 +- inter/final-module/Chapter 1/Final Module.w | 2 +- inter/index-module/Chapter 1/Index Module.w | 2 +- .../Chapter 1/Pipeline Module.w | 2 +- services/arch-module/Chapter 1/Arch Module.w | 2 +- .../Chapter 1/Calculus Module.w | 2 +- services/html-module/Chapter 1/HTML Module.w | 2 +- .../Chapter 1/Inflections Module.w | 2 +- .../kinds-module/Chapter 1/Kinds Module.w | 2 +- .../lexicon-module/Chapter 1/Lexicon Module.w | 2 +- .../Chapter 1/Linguistics Module.w | 2 +- .../Chapter 1/Problems Module.w | 2 +- .../syntax-module/Chapter 1/Syntax Module.w | 2 +- 21 files changed, 58 insertions(+), 59 deletions(-) diff --git a/inbuild/supervisor-module/Chapter 1/Supervisor Module.w b/inbuild/supervisor-module/Chapter 1/Supervisor Module.w index 5609a49c0..365c5f017 100644 --- a/inbuild/supervisor-module/Chapter 1/Supervisor Module.w +++ b/inbuild/supervisor-module/Chapter 1/Supervisor Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/inform7/Figures/memory-diagnostics.txt b/inform7/Figures/memory-diagnostics.txt index 69580ec83..a21580bce 100644 --- a/inform7/Figures/memory-diagnostics.txt +++ b/inform7/Figures/memory-diagnostics.txt @@ -1,6 +1,6 @@ Total memory consumption was 123346K = 120 MB - ---- was used for 2044504 objects, in 362823 frames in 0 x 800K = 0K = 0 MB: + ---- was used for 2044507 objects, in 362826 frames in 0 x 800K = 0K = 0 MB: 33.1% inter_tree_node_array 58 x 8192 = 475136 objects, 41813824 bytes 20.5% text_stream_array 4603 x 100 = 460300 objects, 25924096 bytes @@ -66,8 +66,8 @@ Total memory consumption was 123346K = 120 MB ---- linked_list_item_array 4 x 1000 = 4000 objects, 64128 bytes ---- kind_macro_definition 9 objects, 62280 bytes ---- booking 861 objects, 61992 bytes - ---- scenes_rcd_data 1884 objects, 60288 bytes ---- actions_rcd_data 1884 objects, 60288 bytes + ---- scenes_rcd_data 1884 objects, 60288 bytes ---- command_grammar 130 objects, 58240 bytes ---- kind_constructor 77 objects, 57904 bytes ---- table 7 objects, 56672 bytes @@ -79,15 +79,15 @@ Total memory consumption was 123346K = 120 MB ---- ap_clause_array 2 x 400 = 800 objects, 51264 bytes ---- HTML_tag_array 1 x 1000 objects, 48032 bytes ---- text_substitution 437 objects, 41952 bytes - ---- anl_clause_array 1 x 1000 objects, 40032 bytes ---- activity_list_array 1 x 1000 objects, 40032 bytes + ---- anl_clause_array 1 x 1000 objects, 40032 bytes ---- to_family_data 497 objects, 39760 bytes ---- shared_variable_access_list_array 12 x 100 = 1200 objects, 38784 bytes ---- parsing_data 670 objects, 37520 bytes ---- heading 198 objects, 36432 bytes ---- production_list 617 objects, 34552 bytes - ---- regions_data 670 objects, 32160 bytes ---- counting_data 670 objects, 32160 bytes + ---- regions_data 670 objects, 32160 bytes ---- property_permission 96 objects, 31488 bytes ---- stack_frame_box 305 objects, 29280 bytes ---- verb_sense 403 objects, 29016 bytes @@ -115,7 +115,7 @@ Total memory consumption was 123346K = 120 MB ---- pathname 308 objects, 12320 bytes ---- uniqueness_count 454 objects, 10896 bytes ---- inter_construct 30 objects, 10320 bytes - ---- filename 253 objects, 10120 bytes + ---- filename 256 objects, 10240 bytes ---- stopwatch_timer 113 objects, 9040 bytes ---- equation_node 68 objects, 7616 bytes ---- understanding_item_array 3 x 100 = 300 objects, 7296 bytes @@ -133,8 +133,8 @@ Total memory consumption was 123346K = 120 MB ---- value_property_data 84 objects, 4704 bytes ---- parsing_pp_data 96 objects, 4608 bytes ---- compatibility_specification 86 objects, 4128 bytes - ---- activity 35 objects, 3920 bytes ---- command_line_switch 49 objects, 3920 bytes + ---- activity 35 objects, 3920 bytes ---- submodule_request 94 objects, 3760 bytes ---- parse_node_annotation_type 114 objects, 3648 bytes ---- property_setting_bp_data 84 objects, 3360 bytes @@ -146,10 +146,10 @@ Total memory consumption was 123346K = 120 MB ---- either_or_property_data 62 objects, 2976 bytes ---- target_vm 20 objects, 2880 bytes ---- use_option 29 objects, 2552 bytes - ---- part_of_inference_data 79 objects, 2528 bytes ---- parentage_inference_data 79 objects, 2528 bytes - ---- kind_constructor_instance_array 1 x 100 objects, 2432 bytes + ---- part_of_inference_data 79 objects, 2528 bytes ---- kind_constructor_casting_rule_array 1 x 100 objects, 2432 bytes + ---- kind_constructor_instance_array 1 x 100 objects, 2432 bytes ---- equation_symbol 30 objects, 2400 bytes ---- scene 1 object, 2096 bytes ---- build_script 60 objects, 1920 bytes @@ -160,8 +160,8 @@ Total memory consumption was 123346K = 120 MB ---- noun_filter_token 22 objects, 1408 bytes ---- inter_node_array 34 objects, 1360 bytes ---- special_meaning_holder 33 objects, 1320 bytes - ---- table_column 16 objects, 1280 bytes ---- constant_phrase 20 objects, 1280 bytes + ---- table_column 16 objects, 1280 bytes ---- invocation_options_array 1 x 100 objects, 1224 bytes ---- direction_inference_data 30 objects, 1200 bytes ---- tree_inventory_item 28 objects, 1120 bytes @@ -192,19 +192,19 @@ Total memory consumption was 123346K = 120 MB ---- bp_family 12 objects, 384 bytes ---- source_file 5 objects, 360 bytes ---- inbuild_genre 7 objects, 336 bytes - ---- pronoun 8 objects, 320 bytes ---- grammatical_category 8 objects, 320 bytes - ---- module_request 8 objects, 320 bytes - ---- cached_kind_declaration 8 objects, 320 bytes + ---- pronoun 8 objects, 320 bytes ---- door_dir_notice 5 objects, 320 bytes - ---- tree_inventory 1 object, 312 bytes + ---- cached_kind_declaration 8 objects, 320 bytes + ---- module_request 8 objects, 320 bytes ---- inter_pipeline 1 object, 312 bytes - ---- build_step 4 objects, 288 bytes + ---- tree_inventory 1 object, 312 bytes ---- up_family 9 objects, 288 bytes - ---- contents_entry 7 objects, 280 bytes - ---- door_to_notice 5 objects, 280 bytes + ---- build_step 4 objects, 288 bytes ---- explicit_bp_data 5 objects, 280 bytes ---- compilation_unit 5 objects, 280 bytes + ---- door_to_notice 5 objects, 280 bytes + ---- contents_entry 7 objects, 280 bytes ---- verb_usage_tier 5 objects, 240 bytes ---- adjective_meaning_family 7 objects, 224 bytes ---- test_scenario 1 object, 216 bytes @@ -214,22 +214,22 @@ Total memory consumption was 123346K = 120 MB ---- plural_dictionary_entry 4 objects, 192 bytes ---- inform_project 1 object, 192 bytes ---- kit_dependency 4 objects, 192 bytes + ---- inter_architecture 4 objects, 160 bytes ---- imperative_defn_family 4 objects, 160 bytes ---- inference_subject_family 5 objects, 160 bytes ---- attachment_instruction 4 objects, 160 bytes - ---- inter_architecture 4 objects, 160 bytes ---- element_activation 4 objects, 128 bytes ---- inbuild_nest 3 objects, 120 bytes ---- local_block_value 2 objects, 112 bytes ---- inform_kit_ittt 2 objects, 96 bytes - ---- group_together_function 2 objects, 80 bytes - ---- compile_task_data 1 object, 80 bytes ---- article 2 objects, 80 bytes - ---- figures_data 1 object, 56 bytes - ---- build_methodology 1 object, 56 bytes + ---- compile_task_data 1 object, 80 bytes + ---- group_together_function 2 objects, 80 bytes ---- inter_warehouse 1 object, 56 bytes - ---- star_invention 1 object, 48 bytes + ---- build_methodology 1 object, 56 bytes + ---- figures_data 1 object, 56 bytes ---- HTML_file_state 1 object, 48 bytes + ---- star_invention 1 object, 48 bytes ---- kind_template_definition 1 object, 40 bytes ---- by_function_bp_data 1 object, 40 bytes ---- loop_over_scope 1 object, 40 bytes @@ -237,7 +237,7 @@ Total memory consumption was 123346K = 120 MB 100.0% was used for memory not allocated for objects: - 57.7% text stream storage 72913380 bytes in 477846 claims + 57.7% text stream storage 72913988 bytes in 477852 claims 4.1% dictionary storage 5227008 bytes in 7517 claims ---- sorting 1448 bytes in 149 claims 5.7% source text 7200000 bytes in 3 claims @@ -255,5 +255,5 @@ Total memory consumption was 123346K = 120 MB ---- code generation workspace for objects 1336 bytes in 4 claims 0.2% emitter array storage 280032 bytes in 1997 claims --146.-1% was overhead - -184624848 bytes = -180297K = -176 MB +-146.-1% was overhead - -184624968 bytes = -180297K = -176 MB diff --git a/inform7/Figures/timings-diagnostics.txt b/inform7/Figures/timings-diagnostics.txt index c6246a3fb..6c7b794c8 100644 --- a/inform7/Figures/timings-diagnostics.txt +++ b/inform7/Figures/timings-diagnostics.txt @@ -1,10 +1,10 @@ 100.0% in inform7 run - 71.7% in compilation to Inter - 51.1% in //Sequence::undertake_queued_tasks// - 4.7% in //MajorNodes::pre_pass// - 3.3% in //MajorNodes::pass_1// - 1.8% in //ImperativeDefinitions::assess_all// - 1.8% in //RTPhrasebook::compile_entries// + 73.0% in compilation to Inter + 51.2% in //Sequence::undertake_queued_tasks// + 5.3% in //MajorNodes::pre_pass// + 3.4% in //MajorNodes::pass_1// + 1.9% in //RTPhrasebook::compile_entries// + 1.7% in //ImperativeDefinitions::assess_all// 1.4% in //RTKindConstructors::compile// 1.0% in //Sequence::lint_inter// 0.6% in //MajorNodes::pass_2// @@ -15,19 +15,18 @@ 0.2% in //CompletionModule::compile// 0.2% in //InferenceSubjects::emit_all// 0.2% in //RTKindConstructors::compile_permissions// - 0.2% in //Task::make_built_in_kind_constructors// 0.2% in //World::stages_II_and_III// - 2.7% not specifically accounted for - 25.5% in running Inter pipeline - 9.9% in step 14/15: generate inform6 -> auto.inf - 5.6% in step 5/15: load-binary-kits - 5.4% in step 6/15: make-synoptic-module - 1.4% in step 9/15: make-identifiers-unique + 3.4% not specifically accounted for + 24.3% in running Inter pipeline + 7.9% in step 14/15: generate inform6 -> auto.inf + 5.7% in step 5/15: load-binary-kits + 5.5% in step 6/15: make-synoptic-module + 1.7% in step 9/15: make-identifiers-unique 0.4% in step 12/15: eliminate-redundant-operations 0.4% in step 4/15: compile-splats 0.4% in step 7/15: shorten-wiring + 0.4% in step 8/15: detect-indirect-calls 0.2% in step 11/15: eliminate-redundant-labels - 0.2% in step 8/15: detect-indirect-calls - 1.4% not specifically accounted for - 2.2% in supervisor + 1.5% not specifically accounted for + 2.1% in supervisor 0.5% not specifically accounted for diff --git a/inform7/assertions-module/Chapter 1/Assertions Module.w b/inform7/assertions-module/Chapter 1/Assertions Module.w index fd0813670..1273b2587 100644 --- a/inform7/assertions-module/Chapter 1/Assertions Module.w +++ b/inform7/assertions-module/Chapter 1/Assertions Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/inform7/knowledge-module/Chapter 1/Knowledge Module.w b/inform7/knowledge-module/Chapter 1/Knowledge Module.w index 748d3003d..271adc674 100644 --- a/inform7/knowledge-module/Chapter 1/Knowledge Module.w +++ b/inform7/knowledge-module/Chapter 1/Knowledge Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/inform7/multimedia-module/Chapter 1/Multimedia Module.w b/inform7/multimedia-module/Chapter 1/Multimedia Module.w index 86fc0b1f4..dfbea34c7 100644 --- a/inform7/multimedia-module/Chapter 1/Multimedia Module.w +++ b/inform7/multimedia-module/Chapter 1/Multimedia Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/inform7/runtime-module/Chapter 1/Runtime Module.w b/inform7/runtime-module/Chapter 1/Runtime Module.w index 9adabdee2..b0f79cb46 100644 --- a/inform7/runtime-module/Chapter 1/Runtime Module.w +++ b/inform7/runtime-module/Chapter 1/Runtime Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/inform7/values-module/Chapter 1/Values Module.w b/inform7/values-module/Chapter 1/Values Module.w index 595153512..5d0fddca9 100644 --- a/inform7/values-module/Chapter 1/Values Module.w +++ b/inform7/values-module/Chapter 1/Values Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/inter/bytecode-module/Chapter 1/Bytecode Module.w b/inter/bytecode-module/Chapter 1/Bytecode Module.w index 2b84d7f0d..7465a6571 100644 --- a/inter/bytecode-module/Chapter 1/Bytecode Module.w +++ b/inter/bytecode-module/Chapter 1/Bytecode Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/inter/final-module/Chapter 1/Final Module.w b/inter/final-module/Chapter 1/Final Module.w index 432b18db8..2a28b2b7e 100644 --- a/inter/final-module/Chapter 1/Final Module.w +++ b/inter/final-module/Chapter 1/Final Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/inter/index-module/Chapter 1/Index Module.w b/inter/index-module/Chapter 1/Index Module.w index 9ccf56bc0..470fc3c58 100644 --- a/inter/index-module/Chapter 1/Index Module.w +++ b/inter/index-module/Chapter 1/Index Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/inter/pipeline-module/Chapter 1/Pipeline Module.w b/inter/pipeline-module/Chapter 1/Pipeline Module.w index cbfc7bf5d..b5dd71376 100644 --- a/inter/pipeline-module/Chapter 1/Pipeline Module.w +++ b/inter/pipeline-module/Chapter 1/Pipeline Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/services/arch-module/Chapter 1/Arch Module.w b/services/arch-module/Chapter 1/Arch Module.w index 5a09b7a98..798b691ec 100644 --- a/services/arch-module/Chapter 1/Arch Module.w +++ b/services/arch-module/Chapter 1/Arch Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/services/calculus-module/Chapter 1/Calculus Module.w b/services/calculus-module/Chapter 1/Calculus Module.w index 468e15314..afdf4205f 100644 --- a/services/calculus-module/Chapter 1/Calculus Module.w +++ b/services/calculus-module/Chapter 1/Calculus Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/services/html-module/Chapter 1/HTML Module.w b/services/html-module/Chapter 1/HTML Module.w index 3fa75b4e5..4b449a1b0 100644 --- a/services/html-module/Chapter 1/HTML Module.w +++ b/services/html-module/Chapter 1/HTML Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/services/inflections-module/Chapter 1/Inflections Module.w b/services/inflections-module/Chapter 1/Inflections Module.w index 33b403ae2..c4bdc872d 100644 --- a/services/inflections-module/Chapter 1/Inflections Module.w +++ b/services/inflections-module/Chapter 1/Inflections Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/services/kinds-module/Chapter 1/Kinds Module.w b/services/kinds-module/Chapter 1/Kinds Module.w index 3764f0178..425109fc3 100644 --- a/services/kinds-module/Chapter 1/Kinds Module.w +++ b/services/kinds-module/Chapter 1/Kinds Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/services/lexicon-module/Chapter 1/Lexicon Module.w b/services/lexicon-module/Chapter 1/Lexicon Module.w index 9747b22ac..d024d72ff 100644 --- a/services/lexicon-module/Chapter 1/Lexicon Module.w +++ b/services/lexicon-module/Chapter 1/Lexicon Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/services/linguistics-module/Chapter 1/Linguistics Module.w b/services/linguistics-module/Chapter 1/Linguistics Module.w index bb953c2e1..3de397074 100644 --- a/services/linguistics-module/Chapter 1/Linguistics Module.w +++ b/services/linguistics-module/Chapter 1/Linguistics Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/services/problems-module/Chapter 1/Problems Module.w b/services/problems-module/Chapter 1/Problems Module.w index af0e0a4cc..e8a7addd8 100644 --- a/services/problems-module/Chapter 1/Problems Module.w +++ b/services/problems-module/Chapter 1/Problems Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: diff --git a/services/syntax-module/Chapter 1/Syntax Module.w b/services/syntax-module/Chapter 1/Syntax Module.w index 49e27e9fe..0376c9749 100644 --- a/services/syntax-module/Chapter 1/Syntax Module.w +++ b/services/syntax-module/Chapter 1/Syntax Module.w @@ -2,7 +2,7 @@ Setting up the use of this module. -@ This section simoly sets up the module in ways expected by //foundation//, and +@ This section simply sets up the module in ways expected by //foundation//, and contains no code of interest. The following constant exists only in tools which use this module: