8 Commits

Author	SHA1	Message	Date
Zoltan Somogyi	59b11f84ce	Update the debugger test directory. ... Replace __ with . as the module qualifier symbol. Replace references to io.state with just io. Replace DCGs with state variables. Replace (C->T;E) syntax for if-then-elses with (if C then T else E) syntax. Replace if-then-elses with switches when possible and where this does not affect what is being tested. Replace separate pred and mode declarations with predmode declarations. Put predicate and function declarations just before the definition of the predicate or function. Delete unneeded module qualifications on predicate and function declarations and definitions. Update .exp files (and if needed, .inp files) for the line number changes that result from the above. For tests that have more than one .exp file and where one of those files is affected by the above, add a section to the source file header that says which .exp file is for what grade, with XXXs for the (as yet) unknown parts.	2018-08-28 21:20:59 +10:00
Zoltan Somogyi	590b34cfac	Fix some minor problems in reporting determinism errors. ... compiler/det_report.m: When a goal has too many solutions, but it occurs in a context in which the identity of those solutions does not matter, the compiler inserts a commit scope to prune away the redundant (because they are externally indistinguishable) solutions. When this goal is a switch inside a require_switch_arms_<detism> scope, this commit scope added by determinism analysis screwed up the expectation of the require_switch_arms_<detism> scope that the switch is its IMMEDIATE subgoal. Relax this sometimes-wrong assumption by allowing for a commit scope wrapped around the switch. When generating error messages for cons_ids missing from switches, don't print the module qualifiers for the cons_ids, since users will already know it (it is part of the identity of the type of switch-on variable). Print the missing cons_ids one per line, to make the list easier to read. Fix capitalization in some error messages. compiler/switch_detection.m: When creating switch arms, give each arm a more meaningful context that the context of the original disjunction, which is usually the context of the first ";" operator in it. tests/invalid/switch_arm_multi_not_det.{m,err_exp}: New test case for the fix listed first for det_report.m. tests/invalid/Mmakefile: Enable the new test case. tests/debugger/dice.exp*: tests/invalid/det_errors.err_exp: tests/invalid/require_scopes.err_exp: Update these expected outputs for the changes above.	2016-05-13 05:48:47 +10:00
Zoltan Somogyi	33eb3028f5	Clean up the tests in half the test directories. ... tests/accumulator/*.m: tests/analysis_*/*.m: tests/benchmarks*/*.m: tests/debugger*/*.{m,exp,inp}: tests/declarative_debugger*/*.{m,exp,inp}: tests/dppd*/*.m: tests/exceptions*/*.m: tests/general*/*.m: tests/grade_subdirs*/*.m: tests/hard_coded*/*.m: Make these tests use four-space indentation, and ensure that each module is imported on its own line. (I intend to use the latter to figure out which subdirectories' tests can be executed in parallel.) These changes usually move code to different lines. For the debugger tests, specify the new line numbers in .inp files and expect them in .exp files.	2015-02-14 20:14:03 +11:00
Zoltan Somogyi	2bada9761f	Eliminate some code duplication by unifying the two goal_path types have had ... Estimated hours taken: 2 Branches: main Eliminate some code duplication by unifying the two goal_path types have had until now: one in mdbcomp/program_representation.m and compiler/hlds_goal.m, which differed in only one detail (whether we record the total number of arms in a switch). The new type is in program_representation.m, but with the definition from goal_path.m. Add a "step_" prefix to the function symbols of the goal_path_step type, to avoid ambiguity with the hlds goals the steps describe. Turn the predicates operating on goal_paths into functions for greater convenience of use. mdbcomp/program_representation.m: compiler/hlds_goal.m: Make the change described above. browser/*.m: compiler/*.m: mdbcomp/*.m: slice/*.m: Conform to the change above. tests/debugger/*.exp: Expect the extra information now available for goal path steps describing switches.	2007-01-06 10:56:27 +00:00
Zoltan Somogyi	dd44e0ef62	Replace the "set" command of mdb with a bunch of commands: the `format', ... Estimated hours taken: 16 Branches: main, release Replace the "set" command of mdb with a bunch of commands: the `format', `format_param', `list_context_lines', `list_path', `xml_browser_cmd', `xml_tmp_filename', `fail_trace_counts', `pass_trace_counts' and `max_io_actions' commands. Each of these set just one parameter or one of set of closely related parameters. Move all these commands, and some existing commands that set parameters that were elsewhere, to the "parameter" command category. Extend some of these commands so that if given no arguments, they report the current values of the parameters they would otherwise set. Replace the "set" commands of the mdb browser and of the declarative debugger with a bunch of commands: "format", "depth", "size", "width", "lines", "actions" and "params" (the last prints the current value of the parameters). For each category of mdb commands, create files mercury_trace_cmd_<cat>.[ch], and move the functions dealing with that category of commands there from mercury_trace_internal.c. Give each of these new files a logical structure that was sometimes missing from the relevant parts of mercury_trace_internal.c. NEWS: Mention these changes. doc/mdb_categories: Document these changes. doc/user_guide.texi: Document these changes. Fix an old documentation bug: you couldn't set listing paramaters from a declarative debugger command. Fix an old documentation bug: the description of the goal_path step for scopes was obsolete. Fix some obsolete references to : as module qualifier. browser/parse.m: Update the browser command set along the lines at the top. browser/declarative_user.m: Update the declarative debugger command set along the lines at the top. Move the declaration for the type representing declarative debugger commands to near the top of the file. browser/browser_info.m: Provide some access predicates. Update the predicate that generates mdb commands to save the persistent state of the debugger to generate the new forms of parameter commands. Move types and predicates for dealing with browser parameters from browse.m to here, so that declarative_user.m can use them too. browser/browse.m: Delete the code moved to browser_info.m, and conform to the other changes in the other modules. browser/listing.m: Provide a predicate to return the type of listing paths. scripts/mdbrc.in: Update the commands that set the XML parameters. scripts/Mmakefile: Get mmake to rebuild mdbrc from mdbrc.in when mdbrc.in changes. trace/mercury_trace_internal.c: trace/mercury_trace_cmds.h: trace/mercury_trace_cmd_*.[ch]: Implement the changes described at the top. Fix an old bug: the commands that update the search path for the "list" command don't make the search path term permanent, which is needed in non-conservative-gc grades. trace/mercury_trace_spy.c: Fix some obsolete references to : as module qualifier. trace/mercury_trace_browse.[ch]: Delete the functionality now moved to mercury_trace_cmd_parameter.c. tests/debugger/mdb_command_test.inp: Update the set of commands being tested. tests/debugger/save.{inp,exp}: Update the parameter commands in this test case.	2006-04-04 07:37:31 +00:00
Zoltan Somogyi	25b8b1abc3	Fix several performance bugs that showed up when the compiler was invoked on ... Estimated hours taken: 20 Branches: main Fix several performance bugs that showed up when the compiler was invoked on Douglas Auclair's training_cars example. Also fix some minor problems that made it harder to find the information needed to localize those problems. training_cars.m is hard to compile quickly because it is big in two dimensions: it has lots of clauses, and each clause has big terms. My laptop still tries to swap itself to death on the full version of training_cars.m (it has only 512 Mb), but the compiler now works fine on a version containing about 20% of its clauses, whereas previously it couldn't compile it at all. In most cases, the changes convert N^2 algorithms to NlogN algorithms. They probably have higher constant factors and may yield small slowdowns for small N, but this is probably not noticeable. Avoiding bad worst case behavior is more important. compiler/superhomogeneous.m: Record the number of goals inserted in each goal being converted to superhomogeneous form. If this exceeds a threshold, wrap a from_ground_term scope around it. Put the predicates into a more cohesive sequence. compiler/field_access.m: Work with the code in superhomogeneous to record the number of inserted goals. Reorder the arguments of some performances to be consistent with the predicates in superhomogeneous.m. compiler/modes.m: Use the from_ground_term scope to reverse the list of inserted unifications if necessary. It is much more efficient to do this here than to let it happen by sequences of delays and wakeups. That would have quadratic complexity; this is linear. This is what I originally introduced from_ground_term scopes for. Then, the overhead was too high, because I added one scope per function symbol. This version should be fine, since there is at most one scope added per argument of an atom (clause head or call). compiler/modes.m: compiler/unique_modes.m: When we are processing goals inside a from_ground_term scope, record this fact. compiler/mode_info.m: Make it possible to record this fact. compiler/modecheck_unify.m: When we are inside a from_ground_term scope, don't try to update the insts of vars on the right hand sides of construction unifications. Since these variables came from expansion to superhomogeneous form, those variables won't occur in any following code, so updating their state is useless, and the algorithm we used to do so is linear in the size of the inst. Since the size of an inst of a variable that results from superhomogeneous expansion is itself on average proportional to the size of the original term, this change turns a quadratic algorithm into a linear one. compiler/inst_match.m: Use balanced trees instead of ordered lists to represents sets of expansions, since these sets can be large. Note an opportunity for further improvement. compiler/inst_util.m: Note another opportunity for further improvement. compiler/instmap.m: Rename several predicates to avoid ambiguities. compiler/cse_detection.m: We used to print statistics for the processing of each procedure without saying which procedure it is for; fix this. compiler/switch_detection.m: Don't print progress messages for predicates with no procedures, since they would be misleading. compiler/higher_order.m: Change an algorithm that was quadratic in the number of arms for merging the information from the different arms of disjunctions and switches to an NlogN algorithm. Change the algorithm for merging the info from two branches that quadratic in the number of variables per arm to an NlogN algorithm. Changed some type equivalences to notag types to aid robustness. compiler/quantification.m: Rename several predicates to avoid ambiguities. The sets of variables in different arms of disjunctions and switches tend to have relatively small intersections. Yet the algorithms we used to compute the set of variables free in the disjunction or switch included the variables from the already processed arms in the sets being accumulated when processing later arms, leading to the quadratic behavior. This diff changes the algorithm to process each arm independently, and then use a more balanced algorithm to summarize the result. Specialize the predicates that compute sets of free vars in various HLDS fragments to work either with ordinary_nonlocals or code_gen_nonlocals without making the same decision repeatedly. Move some code out of large predicates into predicates of their own. compiler/Mercury.options: Specify the compiler option that can exploit this specialization to make the code run faster. compiler/simplify.m: Use a more efficient data structure for recording the parameters of an invocation of simplification. Change some predicate names and function symbol names to avoid ambiguity. compiler/common.m: compiler/deforest.m: compiler/deforest.m: compiler/make_hlds_warn.m: compiler/mercury_compile.m: compiler/pd_util.m: compiler/stack_opt.m: compiler/term_constr_build.m: Conform to the changes in simplify.m and/or instmap.m. compiler/mercury_compile.m: Fix a bug in progress messages for polymorphism.m. compiler/equiv_type_hlds.m: Most of the time, substitutions inside insts have no effect, because very few insts include any reference to a types. Instead of the old approach of building new insts and then throwing them away if they are the same as the old ones, don't build new insts at all if the old inst contains no types. compiler/common.m: Change some predicate names to make them clearer. compiler/hlds_clauses.m: Record the number of clauses so far, to allow a more informative progress message to be printed. compiler/add_clause.m: Print this more informative progress message. Conform to the changes in superhomogeneous.m. compiler/code_gen.m: Use the context of the predicate's first clause (which will be the context of the first clause head) as the context of the predicate's interface events. Unlike the context of the body goal, this won't be affected by program transformations such as wrapping a from_ground_term scope around some goals. It is better for users anyway, since the old policy lead to contexts in the middle of procedure bodies if the top level goal was a disjunction, switch or if-then-else. tests/debugger/*.exp: Update the expected outputs to conform to the change to code_gen.m.	2006-03-29 00:57:46 +00:00
Ian MacLarty	3bded6235e	Add a --module option to the mdb dice command to limit output to a specific ... Estimated hours taken: 6 Branches: main Add a --module option to the mdb dice command to limit output to a specific module or package. Write out the trace counts even if the program aborts because of an uncaught exception. browser/dice.m Handle the --module option by adding an extra argument to the read_dice_to_string predicate which is called from mdb. doc/user_guide.texi Document the --module option. mdbcomp/prim_data.m Add a predicate to check if one module is a sub-module of another. runtime/mercury_trace_base.c runtime/mercury_trace_base.h Add a function which writes the trace counts out to the file indicated by the symbolic constant MERCURY_TRACE_COUNTS_FILE_NAME. Move the symbolic constant MERCURY_TRACE_COUNTS_FILE_NAME from runtime/mercury_wrapper.c to runtime/mercury_trace_base.h, so it is accessible from the above function. runtime/mercury_wrapper.c Register a function to write the trace counts to a file when the program aborts because of an uncaught exception. Call the same function when the program terminates normally. tests/debugger/dice.exp tests/debugger/dice.inp Test the new --module option. trace/mercury_trace_internal.c Add and handle the new --module option.	2005-02-18 04:05:35 +00:00
Ian MacLarty	b5550df746	Add mdb `dice' command which reads in a set of passing trace counts and a ... Estimated hours taken: 40 Branches: main Add mdb `dice' command which reads in a set of passing trace counts and a failing trace count and prints a comparison table. The table can be sorted by various metrics and is useful for finding parts of a program executed in a failing run, but not in passing runs. browser/dice.m Add a new module for generating and manipulating a dice. browser/mdb.m Add the dice module. compiler/special_pred.m mdbcomp/prim_data.m Move special_pred_name_arity/3 from compiler/special_pred.m to mdbcomp/prim_data.m so it can be used in dice.m. doc/user_guide.texi Document the `dice' mdb command. Also document the fact that the failing and passing slice file names can be set with the `set' mdb command. Move the `set' command to the misc section from the browser section since it now also sets the passing and failing slice file names, which have nothing to do with the browser. library/list.m Add map4, map5 and map6 since map6 is needed in dice.m. mdbcomp/program_representation.m Add a predicate to convert a goal path to a string. mdbcomp/trace_counts.m Convert string_to_trace_port into a predicate and add a new mode so that a port can be converted back to a string. runtime/mercury_trace_base.h trace/mercury_trace_util.h Move the MR_TRACE_USE_HP and MR_TRACE_CALL_MERCURY macros to runtime/mercury_trace_base.h, so that they can be called from browser/dice.m. tests/Mmake.common Clean up trace counts (which are generated to test the `dice' command). tests/debugger/Mmakefile tests/debugger/dice.exp tests/debugger/dice.exp2 tests/debugger/dice.inp tests/debugger/dice.m tests/debugger/dice.passes Test the `dice' command. trace/mercury_trace_internal.c Add the mdb `dice' command and modify the `set' command so the `fail_trace_count' and `pass_trace_counts' parameters can be set. Add a function to print a dice. Move the `set' command to the misc help section.	2005-02-10 04:10:33 +00:00