mirror of
https://github.com/Mercury-Language/mercury.git
synced 2026-04-20 20:03:44 +00:00
2725b1a331
Estimated hours taken: 220
Aditi update syntax, type and mode checking.
Change the hlds_goal for constructions in preparation for
structure reuse to avoid making multiple conflicting changes.
compiler/hlds_goal.m:
Merge `higher_order_call' and `class_method_call' into a single
`generic_call' goal type. This also has alternatives for the
various Aditi builtins for which type declarations can't
be written.
Remove the argument types field from higher-order/class method calls.
It wasn't used often, and wasn't updated by optimizations
such as inlining. The types can be obtained from the vartypes
field of the proc_info.
Add a `lambda_eval_method' field to lambda_goals.
Add a field to constructions to identify which RL code fragment should
be used for an top-down Aditi closure.
Add fields to constructions to hold structure reuse information.
This is currently ignored -- the changes to implement structure
reuse will be committed to the alias branch.
This is included here to avoid lots of CVS conflicts caused by
changing the definition of `hlds_goal' twice.
Add a field to `some' goals to specify whether the quantification
can be removed. This is used to make it easier to ensure that
indexes are used for updates.
Add a field to lambda_goals to describe whether the modes were
guessed by the compiler and may need fixing up after typechecking
works out the argument types.
Add predicate `hlds_goal__generic_call_id' to work out a call_id
for a generic call for use in error messages.
compiler/purity.m:
compiler/post_typecheck.m:
Fill in the modes of Aditi builtin calls and closure constructions.
This needs to know which are the `aditi__state' arguments, so
it must be done after typechecking.
compiler/prog_data.m:
Added `:- type sym_name_and_arity ---> sym_name/arity'.
Add a type `lambda_eval_method', which describes how a closure
is to be executed. The alternatives are normal Mercury execution,
bottom-up execution by Aditi and top-down execution by Aditi.
compiler/prog_out.m:
Add predicate `prog_out__write_sym_name_and_arity', which
replaces duplicated inline code in a few places.
compiler/hlds_data.m:
Add a `lambda_eval_method' field to `pred_const' cons_ids and
`pred_closure_tag' cons_tags.
compiler/hlds_pred.m:
Remove type `pred_call_id', replace it with type `simple_call_id',
which combines a `pred_or_func' and a `sym_name_and_arity'.
Add a type `call_id' which describes all the different types of call,
including normal calls, higher-order and class-method calls
and Aditi builtins.
Add `aditi_top_down' to the type `marker'.
Remove `aditi_interface' from type `marker'. Interfacing to
Aditi predicates is now handled by `generic_call' hlds_goals.
Add a type `rl_exprn_id' which identifies a predicate to
be executed top-down by Aditi.
Add a `maybe(rl_exprn_id)' field to type `proc_info'.
Add predicate `adjust_func_arity' to convert between the arity
of a function to its arity as a predicate.
Add predicates `get_state_args' and `get_state_args_det' to
extract the DCG state arguments from an argument list.
Add predicate `pred_info_get_call_id' to get a `simple_call_id'
for a predicate for use in error messages.
compiler/hlds_out.m:
Write the new representation for call_ids.
Add a predicate `hlds_out__write_call_arg_id' which
replaces similar code in mode_errors.m and typecheck.m.
compiler/prog_io_goal.m:
Add support for `aditi_bottom_up' and `aditi_top_down' annotations
on pred expressions.
compiler/prog_io_util.m:
compiler/prog_io_pragma.m:
Add predicates
- `prog_io_util:parse_name_and_arity' to parse `SymName/Arity'
(moved from prog_io_pragma.m).
- `prog_io_util:parse_pred_or_func_name_and_arity to parse
`pred SymName/Arity' or `func SymName/Arity'.
- `prog_io_util:parse_pred_or_func_and_args' to parse terms resembling
a clause head (moved from prog_io_pragma.m).
compiler/type_util.m:
Add support for `aditi_bottom_up' and `aditi_top_down' annotations
on higher-order types.
Add predicates `construct_higher_order_type',
`construct_higher_order_pred_type' and
`construct_higher_order_func_type' to avoid some code duplication.
compiler/mode_util.m:
Add predicate `unused_mode/1', which returns `builtin:unused'.
Add functions `aditi_di_mode/0', `aditi_ui_mode/0' and
`aditi_uo_mode/0' which return `in', `in', and `out', but will
be changed to return `di', `ui' and `uo' when alias tracking
is implemented.
compiler/goal_util.m:
Add predicate `goal_util__generic_call_vars' which returns
any arguments to a generic_call which are not in the argument list,
for example the closure passed to a higher-order call or
the typeclass_info for a class method call.
compiler/llds.m:
compiler/exprn_aux.m:
compiler/dupelim.m:
compiler/llds_out.m:
compiler/opt_debug.m:
Add builtin labels for the Aditi update operations.
compiler/hlds_module.m:
Add predicate predicate_table_search_pf_sym, used for finding
possible matches for a call with the wrong number of arguments.
compiler/intermod.m:
Don't write predicates which build `aditi_top_down' goals,
because there is currently no way to tell importing modules
which RL code fragment to use.
compiler/simplify.m:
Obey the `cannot_remove' field of explicit quantification goals.
compiler/make_hlds.m:
Parse Aditi updates.
Don't typecheck clauses for which syntax errors in Aditi updates
are found - this avoids spurious "undefined predicate `aditi_insert/3'"
errors.
Factor out some common code to handle terms of the form `Head :- Body'.
Factor out common code in the handling of pred and func expressions.
compiler/typecheck.m:
Typecheck Aditi builtins.
Allow the argument types of matching predicates to be adjusted
when typechecking the higher-order arguments of Aditi builtins.
Change `typecheck__resolve_pred_overloading' to take a list of
argument types rather than a `map(var, type)' and a list of
arguments to allow a transformation to be performed on the
argument types before passing them.
compiler/error_util.m:
Move the part of `report_error_num_args' which writes
"wrong number of arguments (<x>; expected <y>)" from
typecheck.m for use by make_hlds.m when reporting errors
for Aditi builtins.
compiler/modes.m:
compiler/unique_modes.m:
compiler/modecheck_call.m:
Modecheck Aditi builtins.
compiler/lambda.m:
Handle the markers for predicates introduced for
`aditi_top_down' and `aditi_bottom_up' lambda expressions.
compiler/polymorphism.m:
Add extra type_infos to `aditi_insert' calls
describing the tuple to insert.
compiler/call_gen.m:
Generate code for Aditi builtins.
compiler/unify_gen.m:
compiler/bytecode_gen.m:
Abort on `aditi_top_down' and `aditi_bottom_up' lambda
expressions - code generation for them is not yet implemented.
compiler/magic.m:
Use the `aditi_call' generic_call rather than create
a new procedure for each Aditi predicate called from C.
compiler/rl_out.pp:
compiler/rl_gen.m:
compiler/rl.m:
Move some utility code used by magic.m and call_gen.m into rl.m.
Remove an XXX comment about reference counting being not yet
implemented - Evan has fixed that.
library/ops.m:
compiler/mercury_to_mercury.m:
doc/transition_guide.texi:
Add unary prefix operators `aditi_bottom_up' and `aditi_top_down',
used as qualifiers on lambda expressions.
Add infix operator `==>' to separate the tuples in an
`aditi_modify' call.
compiler/follow_vars.m:
Thread a `map(prog_var, type)' through, needed because
type information is no longer held in higher-order call goals.
compiler/table_gen.m:
Use the `make_*_construction' predicates in hlds_goal.m
to construct constants.
compiler/*.m:
Trivial changes to add extra fields to hlds_goal structures.
doc/reference_manual.texi:
Document Aditi updates.
Use @samp{pragma base_relation} instead of
@samp{:- pragma base_relation} throughout the Aditi documentation
to be consistent with other parts of the reference manual.
tests/valid/Mmakefile:
tests/valid/aditi_update.m:
tests/valid/aditi.m:
Test case.
tests/valid/Mmakefile:
Remove some hard-coded --intermodule-optimization rules which are
no longer needed because `mmake depend' is now run in this directory.
tests/invalid/*.err_exp:
Fix expected output for changes in reporting of call_ids
in typecheck.m.
tests/invalid/Mmakefile
tests/invalid/aditi_update_errors.{m,err_exp}:
tests/invalid/aditi_update_mode_errors.{m,err_exp}:
Test error messages for Aditi updates.
tests/valid/aditi.m:
tests/invalid/aditi.m:
Cut down version of extras/aditi/aditi.m to provide basic declarations
for Aditi compilation such as `aditi__state' and the modes
`aditi_di', `aditi_uo' and `aditi_ui'. Installing extras/aditi/aditi.m
somewhere would remove the need for these.
166 lines
6.0 KiB
Mathematica
166 lines
6.0 KiB
Mathematica
%-----------------------------------------------------------------------------%
|
|
% Copyright (C) 1996-1999 The University of Melbourne.
|
|
% This file may only be copied under the terms of the GNU General
|
|
% Public License - see the file COPYING in the Mercury distribution.
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
% Main author: zs
|
|
|
|
% This module looks for opportunities to apply the "last call modulo
|
|
% constructor application" optimization.
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
:- module lco.
|
|
|
|
:- interface.
|
|
|
|
:- import_module hlds_module, hlds_pred.
|
|
:- import_module io.
|
|
|
|
:- pred lco_modulo_constructors(pred_id, proc_id, module_info,
|
|
proc_info, proc_info, io__state, io__state).
|
|
:- mode lco_modulo_constructors(in, in, in, in, out, di, uo) is det.
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
:- implementation.
|
|
|
|
:- import_module hlds_goal, passes_aux, hlds_out.
|
|
:- import_module list, require, std_util.
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
lco_modulo_constructors(PredId, ProcId, ModuleInfo, ProcInfo0, ProcInfo) -->
|
|
{ proc_info_goal(ProcInfo0, Goal0) },
|
|
{ lco_in_goal(Goal0, ModuleInfo, Goal) },
|
|
( { Goal = Goal0 } ->
|
|
{ ProcInfo = ProcInfo0 }
|
|
;
|
|
{ ProcInfo = ProcInfo0 }, % for now
|
|
% { proc_info_set_goal(ProcInfo0, Goal, ProcInfo) },
|
|
io__write_string("% Can introduce LCO in "),
|
|
hlds_out__write_pred_proc_id(ModuleInfo, PredId, ProcId),
|
|
io__write_string("\n")
|
|
).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
:- pred lco_in_goal(hlds_goal, module_info, hlds_goal).
|
|
:- mode lco_in_goal(in, in, out) is det.
|
|
|
|
lco_in_goal(Goal0 - GoalInfo, ModuleInfo, Goal - GoalInfo) :-
|
|
lco_in_goal_2(Goal0, ModuleInfo, Goal).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
:- pred lco_in_goal_2(hlds_goal_expr, module_info, hlds_goal_expr).
|
|
:- mode lco_in_goal_2(in, in, out) is det.
|
|
|
|
lco_in_goal_2(conj(Goals0), ModuleInfo, conj(Goals)) :-
|
|
list__reverse(Goals0, RevGoals0),
|
|
lco_in_conj(RevGoals0, [], ModuleInfo, Goals).
|
|
|
|
% XXX Some execution algorithm issues here.
|
|
lco_in_goal_2(par_conj(_Goals0, SM), _ModuleInfo, par_conj(_Goals, SM)) :-
|
|
error("sorry: lco of parallel conjunction not implemented").
|
|
|
|
lco_in_goal_2(disj(Goals0, SM), ModuleInfo, disj(Goals, SM)) :-
|
|
lco_in_disj(Goals0, ModuleInfo, Goals).
|
|
|
|
lco_in_goal_2(switch(Var, Det, Cases0, SM), ModuleInfo,
|
|
switch(Var, Det, Cases, SM)) :-
|
|
lco_in_cases(Cases0, ModuleInfo, Cases).
|
|
|
|
lco_in_goal_2(if_then_else(Vars, Cond, Then0, Else0, SM), ModuleInfo,
|
|
if_then_else(Vars, Cond, Then, Else, SM)) :-
|
|
lco_in_goal(Then0, ModuleInfo, Then),
|
|
lco_in_goal(Else0, ModuleInfo, Else).
|
|
|
|
lco_in_goal_2(some(Vars, CanRemove, Goal0), ModuleInfo,
|
|
some(Vars, CanRemove, Goal)) :-
|
|
lco_in_goal(Goal0, ModuleInfo, Goal).
|
|
|
|
lco_in_goal_2(not(Goal), _ModuleInfo, not(Goal)).
|
|
|
|
lco_in_goal_2(generic_call(A,B,C,D), _ModuleInfo, generic_call(A,B,C,D)).
|
|
|
|
lco_in_goal_2(call(A,B,C,D,E,F), _ModuleInfo, call(A,B,C,D,E,F)).
|
|
|
|
lco_in_goal_2(unify(A,B,C,D,E), _ModuleInfo, unify(A,B,C,D,E)).
|
|
|
|
lco_in_goal_2(pragma_c_code(A,B,C,D,E,F,G), _,
|
|
pragma_c_code(A,B,C,D,E,F,G)).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
:- pred lco_in_disj(list(hlds_goal), module_info, list(hlds_goal)).
|
|
:- mode lco_in_disj(in, in, out) is det.
|
|
|
|
lco_in_disj([], __ModuleInfo, []).
|
|
lco_in_disj([Goal0 | Goals0], ModuleInfo, [Goal | Goals]) :-
|
|
lco_in_goal(Goal0, ModuleInfo, Goal),
|
|
lco_in_disj(Goals0, ModuleInfo, Goals).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
:- pred lco_in_cases(list(case), module_info, list(case)).
|
|
:- mode lco_in_cases(in, in, out) is det.
|
|
|
|
lco_in_cases([], __ModuleInfo, []).
|
|
lco_in_cases([case(Cons, Goal0) | Cases0], ModuleInfo,
|
|
[case(Cons, Goal) | Cases]) :-
|
|
lco_in_goal(Goal0, ModuleInfo, Goal),
|
|
lco_in_cases(Cases0, ModuleInfo, Cases).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
% lco_in_conj(RevGoals, Unifies, ModuleInfo, Goals)
|
|
%
|
|
% Given a conjunction whose structure is: "goals*,call,construct*",
|
|
% move the construction unifications before the call.
|
|
%
|
|
% For now the transformation results are usable by humans only.
|
|
% XXX Later we will have to modify the instantiation states
|
|
% recorded for the variables involved in the constructions.
|
|
% The ModuleInfo will be probably be needed by this code.
|
|
%
|
|
% We traverse the conjunction backwards (the caller has reversed the list).
|
|
% RevGoals is the list of remaining goals in the reversed conjunction list.
|
|
% RevUnifies is the list of assignments and constructions delayed by any
|
|
% previous recursive invocations of lco_in_conj.
|
|
%
|
|
% invariant: append(reverse(RevGoals), Unifies) = original conjunction
|
|
|
|
:- pred lco_in_conj(list(hlds_goal), list(hlds_goal), module_info,
|
|
list(hlds_goal)).
|
|
:- mode lco_in_conj(in, in, in, out) is det.
|
|
|
|
lco_in_conj([], Unifies, __ModuleInfo, Unifies).
|
|
lco_in_conj([Goal0 | Goals0], Unifies0, ModuleInfo, Goals) :-
|
|
Goal0 = GoalExpr0 - _,
|
|
(
|
|
GoalExpr0 = unify(_, _, _, Unif, _),
|
|
Unif = construct(_, _, _, _, _, _, _)
|
|
->
|
|
Unifies1 = [Goal0 | Unifies0],
|
|
lco_in_conj(Goals0, Unifies1, ModuleInfo, Goals)
|
|
;
|
|
GoalExpr0 = call(_, _, _, _, _, _)
|
|
->
|
|
list__append(Unifies0, [Goal0], LaterGoals),
|
|
list__reverse(Goals0, FrontGoals),
|
|
list__append(FrontGoals, LaterGoals, Goals)
|
|
;
|
|
% The conjunction does not follow the pattern "unify*, goal"
|
|
% so we cannot optimize it; reconstruct the original goal list
|
|
list__reverse([Goal0 | Goals0], FrontGoals),
|
|
list__append(FrontGoals, Unifies0, Goals)
|
|
).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
%-----------------------------------------------------------------------------%
|