Diff for /gforth/prof-inline.fs between versions 1.3 and 1.5

version 1.3, 2004/09/06 13:44:56 version 1.5, 2004/09/07 09:59:01
Line 77  variable next-profile-point-p \ the addr Line 77  variable next-profile-point-p \ the addr
 profile-points next-profile-point-p !  profile-points next-profile-point-p !
 variable last-colondef-profile \ pointer to the pp of last colon definition  variable last-colondef-profile \ pointer to the pp of last colon definition
 variable current-profile-point  variable current-profile-point
 variable library-calls \ list of calls to library colon defs  variable library-calls 0 library-calls ! \ list of calls to library colon defs
   variable in-compile,? in-compile,? off
   
 \ list stuff  \ list stuff
   
Line 169  variable library-calls \ list of calls t Line 170  variable library-calls \ list of calls t
 : call-count+ ( ud1 callp -- ud2 )  : call-count+ ( ud1 callp -- ud2 )
     calls-call @ profile-count 2@ d+ ;      calls-call @ profile-count 2@ d+ ;
   
 : add-calls ( ud-dyn-callee1 ud-dyn-caller1 u-stat1 xt-test profpp --  : count-dyncalls ( calls -- ud )
               ud-dyn-callee2 ud-dyn-caller2 u-stat2 xt-test )      0. rot ['] call-count+ map-list ;
     \ add the static and dynamic call counts to profpp up, if the  
     \ number of static calls to profpp satisfies xt-test ( u -- f )  : add-calls ( statistics1 xt-test profpp -- statistics2 xt-test )
       \ add statistics for callee profpp up, if the number of static
       \ calls to profpp satisfies xt-test ( u -- f ); see below for what
       \ statistics are computed.
     { xt-test p }      { xt-test p }
     p profile-colondef? @ if ( u-dyn1 u-stat1 )      p profile-colondef? @ if
         p profile-calls @ { calls }          p profile-calls @ { calls }
         calls list-length { stat }          calls list-length { stat }
         stat xt-test execute if ( u-dyn u-stat )          stat xt-test execute if
             stat + >r              { d: ud-dyn-callee d: ud-dyn-caller u-stat u-exec-callees u-callees }
             0. calls ['] call-count+ map-list d+ 2>r              ud-dyn-callee p profile-count 2@ 2dup { d: de } d+
             p profile-count 2@ d+              ud-dyn-caller calls count-dyncalls 2dup { d: dr } d+
             2r> r>              u-stat stat +
               u-exec-callees de dr d<> -
               u-callees 1+
         endif          endif
     endif      endif
     xt-test ;      xt-test ;
   
 : print-stat-line ( xt -- )  : print-stat-line ( xt -- )
     >r 0. 0. 0 r> profile-points @ ['] add-calls map-list drop      >r 0. 0. 0 0 0 r> profile-points @ ['] add-calls map-list drop
     ( ud-dyn-callee ud-dyn-caller u-stat )      ( ud-dyn-callee ud-dyn-caller u-stat )
     7 u.r 12 ud.r 12 ud.r space ;      6 u.r 7 u.r 7 u.r 12 ud.r 12 ud.r space ;
   
   : print-library-stats ( -- )
       library-calls @ list-length 20 u.r \ static callers
       library-calls @ count-dyncalls 12 ud.r \ dynamic callers
       13 spaces ;
   
 : print-statistics ( -- )  : print-statistics ( -- )
     ."  static  dyn-caller  dyn-callee   condition" cr      ." callee exec'd static  dyn-caller  dyn-callee   condition" cr
     ['] 0=  print-stat-line ." calls to coldefs with 0 callers" cr      ['] 0=  print-stat-line ." calls to coldefs with 0 callers" cr
     ['] 1=  print-stat-line ." calls to coldefs with 1 callers" cr      ['] 1=  print-stat-line ." calls to coldefs with 1 callers" cr
     ['] 2=  print-stat-line ." calls to coldefs with 2 callers" cr      ['] 2=  print-stat-line ." calls to coldefs with 2 callers" cr
     ['] 3=  print-stat-line ." calls to coldefs with 3 callers" cr      ['] 3=  print-stat-line ." calls to coldefs with 3 callers" cr
     ['] 1u> print-stat-line ." calls to coldefs with >1 callers" cr      ['] 1u> print-stat-line ." calls to coldefs with >1 callers" cr
       print-library-stats     ." library calls" cr
     ;      ;
   
 : dinc ( profilep -- )  : dinc ( profilep -- )
Line 205  variable library-calls \ list of calls t Line 217  variable library-calls \ list of calls t
     profile-count dup 2@ 1. d+ rot 2! ;      profile-count dup 2@ 1. d+ rot 2! ;
   
 : profile-this ( -- )  : profile-this ( -- )
     new-profile-point POSTPONE literal POSTPONE dinc ;      in-compile,? @ in-compile,? on
       new-profile-point POSTPONE literal POSTPONE dinc
       in-compile,? ! ;
   
 \ Various words trigger PROFILE-THIS.  In order to avoid getting  \ Various words trigger PROFILE-THIS.  In order to avoid getting
 \ several calls to PROFILE-THIS from a compiling word (like ?EXIT), we  \ several calls to PROFILE-THIS from a compiling word (like ?EXIT), we
Line 232  variable library-calls \ list of calls t Line 246  variable library-calls \ list of calls t
 \ better if we had a way of knowing whether we are in a colon def or  \ better if we had a way of knowing whether we are in a colon def or
 \ not (and used that knowledge instead of STATE).  \ not (and used that knowledge instead of STATE).
   
 Defer before-word-profile ( -- )  \ Defer before-word-profile ( -- )
 ' noop IS before-word-profile  \ ' noop IS before-word-profile
   
 : before-word1 ( -- )  \ : before-word1 ( -- )
     before-word-profile defers before-word ;  \     before-word-profile defers before-word ;
   
 ' before-word1 IS before-word  \ ' before-word1 IS before-word
   
 : profile-this-compiling ( -- )  \ : profile-this-compiling ( -- )
     state @ if  \     state @ if
         profile-this  \       profile-this
         ['] noop IS before-word-profile  \       ['] noop IS before-word-profile
     endif ;  \     endif ;
   
 : cock-profiler ( -- )  \ : cock-profiler ( -- )
     \ as in cock the gun - pull the trigger  \     \ as in cock the gun - pull the trigger
     ['] profile-this-compiling IS before-word-profile  \     ['] profile-this-compiling IS before-word-profile
     [ count-calls? ] [if] \ we are at a non-colondef profile point  \     [ count-calls? ] [if] \ we are at a non-colondef profile point
         last-colondef-profile @ profile-straight-line off  \       last-colondef-profile @ profile-straight-line off
     [endif]  \     [endif]
 ;  \ ;
   
 : hook-profiling-into ( "name" -- )  : hook-profiling-into ( "name" -- )
     \ make (deferred word) "name" call cock-profiler, too      \ make (deferred word) "name" call cock-profiler, too
     ' >body >r :noname      ' >body >r :noname
     POSTPONE cock-profiler      POSTPONE profile-this
     r@ @ compile, \ old hook behaviour      r@ @ compile, \ old hook behaviour
     POSTPONE ;      POSTPONE ;
     r> ! ; \ change hook behaviour      r> ! ; \ change hook behaviour
Line 268  Defer before-word-profile ( -- ) Line 282  Defer before-word-profile ( -- )
   
 : note-call ( addr -- )  : note-call ( addr -- )
     \ addr is the body address of a called colon def or does handler      \ addr is the body address of a called colon def or does handler
     dup 3 cells + @ ['] dinc >body = if ( addr )      dup ['] (does>2) >body = if \ adjust does handler address
         current-profile-point @ new-call over cell+ @ profile-calls insert-list          4 cells here 1 cells - +!
     endif      endif
     drop ;      profile-this current-profile-point @ new-call
           over 3 cells + @ ['] dinc >body = if ( addr call-prof-point )
           \ non-library call
            swap cell+ @ profile-calls insert-list
       else ( addr call-prof-point )
           library-calls insert-list drop
       endif ;
   
 : prof-compile, ( xt -- )  : prof-compile, ( xt -- )
       in-compile,? @ if
           DEFERS compile, EXIT
       endif
     dup >does-code if      dup >does-code if
         dup >does-code note-call          dup >does-code note-call
     then      then
     dup >code-address CASE      dup >code-address CASE
         docol:   OF dup >body note-call ENDOF          docol:   OF dup >body note-call ENDOF
         dodefer: OF note-execute ENDOF          dodefer: OF note-execute ENDOF
         dofield: OF >body @ ['] lit+ peephole-compile, , EXIT ENDOF  
         \ dofield: OF >body @ POSTPONE literal ['] + peephole-compile, EXIT ENDOF          \ dofield: OF >body @ POSTPONE literal ['] + peephole-compile, EXIT ENDOF
         \ code words and ;code-defined words (code words could be optimized):          \ code words and ;code-defined words (code words could be optimized):
         dup in-dictionary? IF drop POSTPONE literal ['] execute peephole-compile, EXIT THEN  
     ENDCASE      ENDCASE
     DEFERS compile, ;      DEFERS compile, ;
   
 \ hook-profiling-into then-like  
 \ \ hook-profiling-into if-like    \ subsumed by other-control-flow  
 \ \ hook-profiling-into ahead-like \ subsumed by other-control-flow  
 \ hook-profiling-into other-control-flow  
 \ hook-profiling-into begin-like  
 \ hook-profiling-into again-like  
 \ hook-profiling-into until-like  
   
 : :-hook-profile ( -- )  : :-hook-profile ( -- )
     defers :-hook      defers :-hook
     next-profile-point-p @      next-profile-point-p @
Line 302  Defer before-word-profile ( -- ) Line 315  Defer before-word-profile ( -- )
     @ dup last-colondef-profile !      @ dup last-colondef-profile !
     profile-colondef? on ;      profile-colondef? on ;
   
   \ hook-profiling-into then-like
   \ \ hook-profiling-into if-like    \ subsumed by other-control-flow
   \ \ hook-profiling-into ahead-like \ subsumed by other-control-flow
   \ hook-profiling-into other-control-flow
   \ hook-profiling-into begin-like
   \ hook-profiling-into again-like
   \ hook-profiling-into until-like
 ' :-hook-profile IS :-hook  ' :-hook-profile IS :-hook
 ' prof-compile, IS compile,  
   
   ' prof-compile, IS compile,

Removed from v.1.3  
changed lines
  Added in v.1.5


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>