9 Commits

Author	SHA1	Message	Date
Simon Taylor	82c6cdb55e	Make definitions of abstract types available when generating ... Estimated hours taken: 100 Branches: main Make definitions of abstract types available when generating code for importing modules. This is necessary for the .NET back-end, and for `:- pragma export' on the C back-end. compiler/prog_data.m: compiler/modules.m: compiler/make.dependencies.m: compiler/recompilation.version.m: Handle implementation sections in interface files. There is a new pseudo-declaration `abstract_imported' which is applied to items from the implementation section of an interface file. `abstract_imported' items may not be used in the error checking passes for the curent module. compiler/equiv_type_hlds.m: compiler/notes/compiler_design.html: New file. Go over the HLDS expanding all types fully after semantic checking has been run. compiler/mercury_compile.m: Add the new pass. Don't write the `.opt' file if there are any errors. compiler/instmap.m: Add a predicate instmap_delta_map_foldl to apply a procedure to all insts in an instmap. compiler/equiv_type.m: Export predicates for use by equiv_type_hlds.m Reorder arguments so state variables and higher-order programming can be used. compiler/prog_data.m: compiler/prog_io_pragma.m: compiler/make_hlds.m: compiler/mercury_to_mercury.m: Handle `:- pragma foreign_type' as a form of type declaration rather than a pragma. compiler/hlds_data.m: compiler/*.m: Add a field to the type_info_cell_constructor cons_id to identify the type_ctor, which is needed by equiv_type_hlds.m. compiler/module_qual.m: Donn't allow items from the implementation section of interface files to match items in the current module. compiler/*.m: tests/*/*.m: Add missing imports which only became apparent with the bug fixes above. Remove unnecessary imports which only became apparent with the bug fixes above. tests/hard_coded/Mmakefile: tests/hard_coded/export_test2.{m,exp}: Test case. tests/invalid/Mmakefile: tests/invalid/missing_interface_import2.{m,err_exp}: Test case.	2003-12-01 15:56:15 +00:00
Zoltan Somogyi	a2bf36e49a	This diff contains no changes in algorithms whatsoever. ... Estimated hours taken: 4 Branches: main This diff contains no changes in algorithms whatsoever. browser/*.m: compiler/*.m: library/*.m: Replace old-style lambdas with new-style lambdas or with named procedures.	2003-11-05 03:17:49 +00:00
Zoltan Somogyi	9551640f55	Import only one compiler module per line. Sort the blocks of imports. ... Estimated hours taken: 2 Branches: main compiler/*.m: Import only one compiler module per line. Sort the blocks of imports. This makes it easier to merge in changes. In a couple of places, remove unnecessary imports.	2003-03-15 03:09:14 +00:00
Fergus Henderson	7597790760	Use sub-modules to structure the modules in the Mercury compiler directory. ... The main aim of this change is to make the overall, high-level structure of the compiler clearer, and to encourage better encapsulation of the major components. compiler/libs.m: compiler/backend_libs.m: compiler/parse_tree.m: compiler/hlds.m: compiler/check_hlds.m: compiler/transform_hlds.m: compiler/bytecode_backend.m: compiler/aditi_backend.m: compiler/ml_backend.m: compiler/ll_backend.m: compiler/top_level.m: New files. One module for each of the major components of the Mercury compiler. These modules contain (as separate sub-modules) all the other modules in the Mercury compiler, except gcc.m and mlds_to_gcc.m. Mmakefile: compiler/Mmakefile: Handle the fact that the top-level module is now `top_level', not `mercury_compile' (since `mercury_compile' is a sub-module of `top_level'). compiler/Mmakefile: Update settings of *FLAGS-<modulename> to use the appropriate nested module names. compiler/recompilation_check.m: compiler/recompilation_version.m: compiler/recompilation_usage.m: compiler/recompilation.check.m: compiler/recompilation.version.m: compiler/recompilation.version.m: Convert the `recompilation_*' modules into sub-modules of the `recompilation' module. compiler/*.m: compiler/*.pp: Module-qualify the module names in `:- module', `:- import_module', and `:- use_module' declarations. compiler/base_type_info.m: compiler/base_type_layout.m: Deleted these unused empty modules. compiler/prog_data.m: compiler/globals.m: Move the `foreign_language' type from prog_data to globals. compiler/mlds.m: compiler/ml_util.m: compiler/mlds_to_il.m: Import `globals', for `foreign_language'. Mmake.common.in: trace/Mmakefile: runtime/Mmakefile: Rename the %.check.c targets as %.check_hdr.c, to avoid conflicts with compiler/recompilation.check.c.	2002-03-20 12:37:56 +00:00
Zoltan Somogyi	b51c742885	Allow the debugger to print higher order values and typeinfos, mainly by ... Estimated hours taken: 50 Branches: main Allow the debugger to print higher order values and typeinfos, mainly by making the committed choice modes of the predicates in deconstruct.m to deconstruct higher order values and typeinfos. (The non committed choice versions will continue to return only placeholders.) Having the debugger print typeinfos is occasionally useful but more often it is just distracting. This change therefore adds a new debugger command, "print_optionals", that toggles the printing of optional values. For now, the only optional values are typeinfos. NEWS: Mention the new capability and the new predicates in the library. Mention the predicates added previously that allow the caller to specify how non-canonical terms should be handled, since the change in their semantics that we anticipated when they were added has now happened, and their semantics should now be more stable. browser/browser_info.m: Use the predicates in the deconstruct.m instead of std_util, to make the choice of noncanonical term method handling explicit. browser/browse.m: When writing small terms using io__write_univ, explicitly use the same noncanonical term handling method as browser_info.m library/io.m: Add predicates to retrieve the current input and output streams. Add versions of io__write_univ that specify the stream and maybe the method of handling noncanonical terms. Add a mode to io__write_list that allows the closure that prints the list elements to be cc_multi. All of these are for the new functionality in the browser. runtime/mercury_ml_expand_body.h: In committed choice contexts, deconstruct closures as if they were ordinary terms, with the function symbol being the name of the predicate/function and the arguments being the terms stored in the closure. In committed choice contexts, deconstruct typeinfos as if they were ordinary terms, with the function symbol being the name of the type constructor and the arguments being the type constructor's arguments. runtime/mercury_type_info.[ch]: Add a new function, MR_collapse_ctor_equivalences, for use by mercury_ml_expand_body.h. Delete a redundant function comment. library/deconstruct.m: Document the changes in the behavior of the predicates defined in this module as a result of the change to mercury_ml_expand_body.h. runtime/mercury_ho_call.h: runtime/mercury_stack_layout.h: Add prefixes on structure field names that did not have them. browser/dl.m: Add prefixes where needed by the changes to mercury_ho_call.h. runtime/mercury_layout_util.[ch]: Remove the first argument of MR_materialize_closure_typeinfos, since its correct value is always the same part of the second argument. runtime/mercury_deep_copy_body.h: Do not pass the first argument of MR_materialize_closure_typeinfos. Add field name prefixes where necessary. compiler/modules.m: The mercury_builtin module is no longer part of the library. compiler/pd_debug.m: compiler/rl_analyze.m: Minor updates to avoid trying to take the address of io__write_list, since it now has more than one mode. runtime/mercury_init.h: runtime/mercury_wrapper.[ch]: trace/mercury_trace_vars.[ch]: Add a parameter to MR_trace_browse_all_on_level that specifies whether we should print values of type type_info. trace/mercury_trace_vars.c: Do not ignore predicates and functions anymore. runtime/mercury_stack_trace.c: trace/mercury_trace.c: trace/mercury_trace_declarative.c: trace/mercury_trace_external.c: Pass the new parameter of MR_trace_browse_all_on_level. trace/mercury_trace_internal.c: Implement the "print_optionals" command. doc/user_guide.texi: Document the "print_optionals" command. tests/debugger/mdb_command_test.inp: Test the documentation of "print_optionals". tests/debugger/higher_order.{m,inp,exp,exp2}: A new test case to exercise the ability to print higher order values. Note that the format of the predicate names in the output should be improved, but that is a separate change since doing it the right way requires bootstrapping. tests/debugger/Mmakefile: Enable the new test case. tests/debugger/nondet_stack.exp*: Update the expected output to reflect the fact that nondet stack dumps, being intended for debugging, include type_infos. tests/debugger/tabled_read_decl.exp*: Update the expected output to reflect the fact that for maximum usefulness, the printing of I/O action atoms prints meaningful type_infos. tests/hard_coded/deconstruct_arg.*: tests/hard_coded/write_reg1.*: Expand these tests to check that we handle higher order values correctly not just when canonicalizing but also in committed choice modes.	2002-02-24 11:53:46 +00:00
Simon Taylor	311d0af1e5	Constraint propagation. ... Estimated hours taken: 90 Constraint propagation. compiler/constraint.m: Push constraints left and inwards as much as possible within a goal. This module has been completely rewritten. compiler/deforest.m: Push constraints within a goal before processing it. Make specialized versions for calls with constrained outputs. Rerun determinism inference on specialized versions when constraint propagation has been run, because the determinism can change from nondet to semidet. compiler/pd_util.m: Add pd_util__propagate_constraints, which uses constraint.m to push constraints within a goal. Add some documentation for the exported predicates. compiler/pd_term.m: Add support for checking termination of the optimization process for constraint propagation, which differs from deforestation in that the conjunctions selected for optimization don't necessarily have a call at both ends. compiler/pd_debug.m: Print some extra information when `--debug-pd' is enabled. compiler/mercury_compile.m: Check whether constraint propagation should be performed when working out whether to run the deforestation pass. compiler/make_hlds.m: Add `no_inline' markers to the "recursive" procedures introduced for builtins to stop constraint propagation attempting to specialize such procedures. compiler/hlds_pred.m: Don't fill in the declared determinism field of the predicates introduced by `hlds_pred__define_new_pred', so that rerunning determinism inference will compute a more accurate determinism. compiler/inlining.m: Requantify before recomputing instmap_deltas, not after. compiler/det_report.m: Add predicates to disable warnings when rerunning determinism analysis after constraint propagation. compiler/options.m: Add documentation for `--constraint-propagation'. Add option `--local-constraint-propagation', which makes deforestation call constraint.m to move constraints within a goal, but does not create specialized versions of procedures for which there are calls with constrained outputs. compiler/handle_options.m: `--constraint-propagation' implies `--local-constraint-propagation'. compiler/notes/compiler_design.html: Change the documentation to show that constraint.m is now part of the deforestation pass. NEWS: Announce the new transformation. doc/user_guide.texi: Document the new options. tests/hard_coded/Mmakefile: tests/hard_coded/constraint.{m,exp}: tests/hard_coded/constraint_order.{m,exp}: Test cases.	2001-08-11 14:09:57 +00:00
Zoltan Somogyi	8d41d4200a	Fix some old problems with HLDS dumps, including blank lines between goals ... Estimated hours taken: 4 Fix some old problems with HLDS dumps, including blank lines between goals (using vi's paragraph commands to move between predicates now works), unescaped characters in strings and chars in unifications, and extra dots in type definitions. compiler/hlds_out.m: Make the above fixes. To fix the problem of blank lines between goals, we reinterpret the meaning of the Follow arguments of several predicates that print goals, which say what to print after the goal, to include the newline to print after the goal. This avoids lots of separate calls to io__write_string("\n"). Document the meanings of the arguments of many predicates. compiler/prog_out.m: Modify prog_out__write_sym_name to escape any special characters (e.g. newlines) in the symbols written. (Strings, as cons_ids, are printed as symbols.) Add a new predicate for printing a symbol with single forward quotes around it. compiler/mercury_to_mercury: When printing cons_id, quote strings. compiler/constraint.m: compiler/mode_errors.m: compiler/pd_debug.m: compiler/rl_dump.m: compiler/saved_vars.m: Conform to the new meaning of the Follow arguments in hlds_out.m.	1999-03-12 06:14:17 +00:00
Thomas Conway	5c955626f2	These changes make var' and term' polymorphic. ... Estimated hours taken: 20 These changes make `var' and `term' polymorphic. This allows us to make variables and terms representing types of a different type to those representing program terms and those representing insts. These changes do not *fix* any existing problems (for instance there was a messy conflation of program variables and inst variables, and where necessary I've just called varset__init(InstVarSet) with an XXX comment). NEWS: Mention the changes to the standard library. library/term.m: Make term, var and var_supply polymorphic. Add new predicates: term__generic_term/1 term__coerce/2 term__coerce_var/2 term__coerce_var_supply/2 library/varset.m: Make varset polymorphic. Add the new predicate: varset__coerce/2 compiler/prog_data.m: Introduce type equivalences for the different kinds of vars, terms, and varsets that we use (tvar and tvarset were already there but have been changed to use the polymorphic var and term). Also change the various kinds of items to use the appropriate kinds of var/varset. compiler/*.m: Thousands of boring changes to make the compiler type correct with the different types for type, program and inst vars and varsets.	1998-11-20 04:10:36 +00:00
Simon Taylor	75354e38bb	Deforestation. ... Estimated hours taken: 400 Deforestation. This increases the code size of the compiler by ~80k when compiling with --intermodule-optimization --deforestation. The improvement from deforestation is not measurable for mmc -C make_hlds.m. Compile time for make_hlds.m increased from 50.7 seconds to 52.2 seconds when running deforestation. compiler/simplify.m compiler/common.m Provide a nicer interface for simplifying a goal, not an entire procedure. Rework the interface to avoid manipulating lots of booleans. Return an estimate of the improvement in cost from simplification. Remove failing cases and disjuncts. Add an option to optimize common structures even across calls. Remove code to merge branched goals, since that is now done by deforestation. Fix a bug: the code to collect instmap_deltas for cases was not including the switched-on variable in the instmap_delta, which caused an abort in merge_instmap_delta if the switched on variable was further instantiated in the switch. This came up while compiling the compiler with --deforestation. compiler/det_report. Output duplicate call warnings even if --warn-simple-code is not set. XXX fix the same problem with `:- pragma obsolete'. compiler/code_aux.m Update code_aux__cannot_loop to use termination information. compiler/hlds_pred.m compiler/dnf.m Pass the type_info_varmap and typeclass_info_varmap into hlds_pred__define_new_pred. Restrict the variables of the new procedure onto the variables of the goal. Make sure all relevant type_infos are passed into the new procedure if --typeinfo-liveness is set. compiler/modes.m compiler/unique_modes.m compiler/mode_info.m compiler/modecheck_unify.m Put `how_to_check_goal' into the mode_info, rather than passing it around. Add a field to the `check_unique_modes' case which controls whether unique modes is allowed to choose a different procedure. For deforestation, this is not allowed, since it could result in choosing a less efficient procedure after generalisation. compiler/options.m New options: --deforestation --deforestation-depth-limit Safety net for termination of the algorithm. --deforestation-cost-factor Fudge factor for working out whether deforestation was worthwhile. --deforestation-vars-threshold Like --inline-vars-threshold. Enable deforestation at -O3. Removed an unnecessary mode for option_defaults_2, since it resulted in a warning about disjuncts which cannot succeed. compiler/handle_options.m --no-reorder-conj implies --no-deforestation. compiler/inlining.m Separate code to rename goals into inlining__do_inline_call. compiler/hlds_goal.m Added predicates goal_list_nonlocals, goal_list_instmap_delta and goal_list_determinism to approximate information about conjunctions. compiler/hlds_module.m Added module_info_set_pred_proc_info to put an updated pred_info and proc_info back into the module_info. compiler/hlds_out.m Exported hlds_out__write_instmap for debugging of deforestation. Bracket module names on constructors where necessary. compiler/mercury_compile.m Call deforestation. Use the new interface to simplify.m. compiler/intermod.m Put recursive predicates with a top-level branched goal into `.opt' files. goal_util.m Added goal_calls_pred_id to work out if a predicate is recursive before mode analysis. Export goal_util__goals_goal_vars for use by deforestation. Give a better message for a missing variable in a substitution. compiler/instmap.m Give a better message for inst_merge failing. compiler/notes/compiler_design.m Document the new modules. library/varset.m Add varset__select to project a varset's names and values onto a set of variables. doc/user_guide.texi Document deforestation. Remove a reference to a non-existent option, --no-specialize. util/mdemangle.c profiler/demangle.m tests/misc_tests/mdemangle_test.{exp,inp} Handle the `DeforestationIn__' predicate names introduced by deforestation, similar to the `IntroducedFrom__' for lambda goals. New files: deforest.m Deforestation. pd_cost.m Cost estimation. pd_debug.m Debugging output. pd_info.m State type and version control. pd_term.m Termination checking. pd_util.m Utility predicates	1998-04-27 04:05:12 +00:00