[m-rev.] for review: term size profiling

[Zoltan Somogyi]

On 29-May-2003, Fergus Henderson <fjh at cs.mu.OZ.AU> wrote:
> Firstly, I want to say that it would be much, *much*, *MUCH*
> easier to review this change if the change was broken into
> smaller parts. 12000 lines of diff is just too much to review
> at once; it's too difficult to keep enough of it in your head
> at once to make sure that the change is correct, consistent,
> and complete.

Separating them out during development would also be hard. Most of the
ancillary changes included in this change are things that were immediately
needed while working on term size profiling; making them in a separate
workspace, bootchecking them, having them reviewed and only then using them
would have cost far too much wall clock time. Using them before they are
reviewed would have meant extra work in fixing conflicts caused by changes
in response to review comments.

I will therefore separate out only the parts for which those conflicts are
likely to be minimal.

Here is one you did not identify. Like most of the ones you did identify,
it is only a couple of hundred lines or so; even I separated them *all* out,
the main diff would be likely to be over 9000 lines.

browser/declarative_tree.m:
browser/program_representation.m:
compiler/prog_rep.m:
	Fix a bug: treat unsafe casts as we treat assignment unifications.
	We used to treat them as calls, which was wrong, because unlike calls,
	unsafe_casts do not generate trace events.

	There is no test case, because the compiler does not yet generate
	unsafe_casts with option settings that are compatible with declarative
	debugging.

Zoltan.

cvs diff: Diffing .
cvs diff: Diffing analysis
cvs diff: Diffing bindist
cvs diff: Diffing boehm_gc
cvs diff: Diffing boehm_gc/Mac_files
cvs diff: Diffing boehm_gc/cord
cvs diff: Diffing boehm_gc/cord/private
cvs diff: Diffing boehm_gc/doc
cvs diff: Diffing boehm_gc/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing boehm_gc/tests
cvs diff: Diffing browser
Index: browser/declarative_tree.m
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/declarative_tree.m,v
retrieving revision 1.1
diff -u -b -r1.1 declarative_tree.m
--- browser/declarative_tree.m	13 Sep 2002 04:17:40 -0000	1.1
+++ browser/declarative_tree.m	29 May 2003 14:52:27 -0000
@@ -895,9 +895,22 @@
 		)
 	;
 		AtomicGoal = unify_assign_rep(ToVar, FromVar),
+		% We handle assigns the same as we handle unsafe casts.
 		( list__member(Var0, BoundVars) ->
 			decl_require(unify(Var0, ToVar),
 				"traverse_primitives", "bad assign"),
+			traverse_primitives(Prims, FromVar, TermPath0,
+				Store, ProcRep, Origin)
+		;
+			traverse_primitives(Prims, Var0, TermPath0,
+				Store, ProcRep, Origin)
+		)
+	;
+		AtomicGoal = unsafe_cast_rep(ToVar, FromVar),
+		% We handle unsafe casts the same as we handle assigns.
+		( list__member(Var0, BoundVars) ->
+			decl_require(unify(Var0, ToVar),
+				"traverse_primitives", "bad unsafe_cast"),
 			traverse_primitives(Prims, FromVar, TermPath0,
 				Store, ProcRep, Origin)
 		;
Index: browser/program_representation.m
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/program_representation.m,v
retrieving revision 1.8
diff -u -b -r1.8 program_representation.m
--- browser/program_representation.m	23 Apr 2002 08:52:34 -0000	1.8
+++ browser/program_representation.m	29 May 2003 14:52:33 -0000
@@ -100,6 +100,10 @@
 			var_rep,		% target
 			var_rep			% source
 		)
+	;	unsafe_cast_rep(
+			var_rep,		% target
+			var_rep			% source
+		)
 	;	unify_simple_test_rep(
 			var_rep,
 			var_rep
@@ -216,6 +220,7 @@
 atomic_goal_generates_event(unify_deconstruct_rep(_, _, _)) = no.
 atomic_goal_generates_event(unify_assign_rep(_, _)) = no.
 atomic_goal_generates_event(unify_simple_test_rep(_, _)) = no.
+atomic_goal_generates_event(unsafe_cast_rep(_, _)) = no.
 atomic_goal_generates_event(pragma_foreign_code_rep(_)) = no.
 atomic_goal_generates_event(higher_order_call_rep(_, Args)) = yes(Args).
 atomic_goal_generates_event(method_call_rep(_, _, Args)) = yes(Args).
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
Index: compiler/prog_rep.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/prog_rep.m,v
retrieving revision 1.17
diff -u -b -r1.17 prog_rep.m
--- compiler/prog_rep.m	18 Mar 2003 02:43:42 -0000	1.17
+++ compiler/prog_rep.m	29 May 2003 14:54:46 -0000
@@ -208,10 +208,12 @@
 		AtomicGoalRep = method_call_rep(VarRep, MethodNum, ArgsRep)
 	;
 		GenericCall = unsafe_cast,
-		mercury_private_builtin_module(ModuleSymName),
-		prog_out__sym_name_to_string(ModuleSymName, ModuleName),
-		AtomicGoalRep = plain_call_rep(ModuleName,
-			"unsafe_type_cast", ArgsRep)
+		( ArgsRep = [InputArgRep, OutputArgRep] ->
+			AtomicGoalRep = unsafe_cast_rep(OutputArgRep,
+				InputArgRep)
+		;
+			error("represent_goal_expr: unsafe_cast arity != 2")
+		)
 	;
 		GenericCall = aditi_builtin(_, _),
 		error("Sorry, not yet implemented\n\
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/aditi
cvs diff: Diffing extras/cgi
cvs diff: Diffing extras/complex_numbers
cvs diff: Diffing extras/complex_numbers/samples
cvs diff: Diffing extras/complex_numbers/tests
cvs diff: Diffing extras/concurrency
cvs diff: Diffing extras/curs
cvs diff: Diffing extras/curs/samples
cvs diff: Diffing extras/curses
cvs diff: Diffing extras/curses/sample
cvs diff: Diffing extras/dynamic_linking
cvs diff: Diffing extras/error
cvs diff: Diffing extras/graphics
cvs diff: Diffing extras/graphics/mercury_opengl
cvs diff: Diffing extras/graphics/mercury_tcltk
cvs diff: Diffing extras/graphics/samples
cvs diff: Diffing extras/graphics/samples/calc
cvs diff: Diffing extras/graphics/samples/maze
cvs diff: Diffing extras/graphics/samples/pent
cvs diff: Diffing extras/lazy_evaluation
cvs diff: Diffing extras/lex
cvs diff: Diffing extras/lex/samples
cvs diff: Diffing extras/lex/tests
cvs diff: Diffing extras/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
cvs diff: Diffing extras/morphine
cvs diff: Diffing extras/morphine/non-regression-tests
cvs diff: Diffing extras/morphine/scripts
cvs diff: Diffing extras/morphine/source
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/posix
cvs diff: Diffing extras/quickcheck
cvs diff: Diffing extras/quickcheck/tutes
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/stream
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing java
cvs diff: Diffing java/library
cvs diff: Diffing java/runtime
cvs diff: Diffing library
cvs diff: Diffing profiler
cvs diff: Diffing robdd
cvs diff: Diffing runtime
cvs diff: Diffing runtime/GETOPT
cvs diff: Diffing runtime/machdeps
cvs diff: Diffing samples
cvs diff: Diffing samples/c_interface
cvs diff: Diffing samples/c_interface/c_calls_mercury
cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/mercury_calls_c
cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing samples/solutions
cvs diff: Diffing samples/tests
cvs diff: Diffing samples/tests/c_interface
cvs diff: Diffing samples/tests/c_interface/c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/tests/c_interface/mercury_calls_c
cvs diff: Diffing samples/tests/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/tests/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/tests/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/tests/diff
cvs diff: Diffing samples/tests/muz
cvs diff: Diffing samples/tests/rot13
cvs diff: Diffing samples/tests/solutions
cvs diff: Diffing samples/tests/toplevel
cvs diff: Diffing scripts
cvs diff: Diffing tests
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
cvs diff: Diffing tests/debugger/declarative
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/general/string_format
cvs diff: Diffing tests/general/structure_reuse
cvs diff: Diffing tests/grade_subdirs
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/exceptions
cvs diff: Diffing tests/hard_coded/purity
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/mmc_make
cvs diff: Diffing tests/mmc_make/lib
cvs diff: Diffing tests/recompilation
cvs diff: Diffing tests/tabling
cvs diff: Diffing tests/term
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
cvs diff: Diffing tools
cvs diff: Diffing trace
cvs diff: Diffing util
cvs diff: Diffing vim
cvs diff: Diffing vim/after
cvs diff: Diffing vim/ftplugin
cvs diff: Diffing vim/syntax
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------