mirror of
https://github.com/open-goal/jak-project
synced 2026-08-20 14:24:45 -04:00
Tyler Wilding
c162c66118
This PR does two main things: 1. Work through the main low-hanging fruit issues in the formatter keeping it from feeling mature and usable 2. Iterate and prove that point by formatting all of the Jak 1 code base. **This has removed around 100K lines in total.** - The decompiler will now format it's results for jak 1 to keep things from drifting back to where they were. This is controlled by a new config flag `format_code`. How am I confident this hasn't broken anything?: - I compiled the entire project and stored it's `out/jak1/obj` files separately - I then recompiled the project after formatting and wrote a script that md5's each file and compares it (`compare-compilation-outputs.py` - The results (eventually) were the same:  > This proves that the only difference before and after is non-critical whitespace for all code/macros that is actually in use. I'm still aware of improvements that could be made to the formatter, as well as general optimization of it's performance. But in general these are for rare or non-critical situations in my opinion and I'll work through them before doing Jak 2. The vast majority looks great and is working properly at this point. Those known issues are the following if you are curious: 
310 lines
13 KiB
Common Lisp
310 lines
13 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
(bundles "ENGINE.CGO" "GAME.CGO")
|
|
(require "engine/gfx/hw/display.gc")
|
|
(require "engine/gfx/tfrag/tfrag-h.gc")
|
|
(require "engine/debug/stats-h.gc")
|
|
(require "engine/gfx/background/subdivide-h.gc")
|
|
|
|
;; This file mainly contains statistics stuff for the background renderers.
|
|
;; And the mysterious "gomi stats hack", abbreviated GSH.
|
|
|
|
;; DECOMP BEGINS
|
|
|
|
(define *merc-global-stats* (new 'global 'merc-global-stats))
|
|
|
|
(defun clear-tr-stat ((arg0 tr-stat))
|
|
(set! (-> arg0 groups) (the-as uint 0))
|
|
(set! (-> arg0 fragments) (the-as uint 0))
|
|
(set! (-> arg0 tris) (the-as uint 0))
|
|
(set! (-> arg0 dverts) (the-as uint 0))
|
|
(set! (-> arg0 instances) (the-as uint 0))
|
|
0
|
|
(none))
|
|
|
|
;; These contain the groups/frags/tris/dverts/insts statistics.
|
|
(define *stat-string-tfrag* (new 'global 'string 128 (the-as string #f)))
|
|
|
|
(define *stat-string-tfrag-near* (new 'global 'string 128 (the-as string #f)))
|
|
|
|
(define *stat-string-total* (new 'global 'string 128 (the-as string #f)))
|
|
|
|
(defun-debug print-tr-stat ((stat tr-stat) (name string) (dest string))
|
|
"Print the statistics for stat to dest and to the screen. Also add them to the total stats"
|
|
(clear dest)
|
|
(when (nonzero? (+ (-> stat groups) (-> stat fragments) (-> stat tris) (-> stat dverts) (-> stat instances)))
|
|
(format dest "~0k~4d ~5d ~6d ~6d" (-> stat groups) (-> stat fragments) (-> stat tris) (-> stat dverts))
|
|
(format dest
|
|
"~0k ~7f ~5d ~s"
|
|
(/ (* 2.0 (the float (-> stat tris))) (the float (- (-> stat dverts) (-> stat tris))))
|
|
(-> stat instances)
|
|
name)
|
|
;; print to the screen
|
|
(format *stdcon* "~S~%" dest)
|
|
;; update total
|
|
(+! (-> *terrain-stats* total groups) (-> stat groups))
|
|
(+! (-> *terrain-stats* total fragments) (-> stat fragments))
|
|
(+! (-> *terrain-stats* total tris) (-> stat tris))
|
|
(+! (-> *terrain-stats* total dverts) (-> stat dverts))
|
|
(+! (-> *terrain-stats* total instances) (-> stat instances)))
|
|
(none))
|
|
|
|
(defun-debug print-terrain-stats ()
|
|
"Print all terrain statistics"
|
|
;; make our own profile thing.
|
|
(if *debug-segment*
|
|
(add-frame (-> *display* frames (-> *display* on-screen) frame profile-bar 0)
|
|
'draw
|
|
(new 'static 'rgba :r #x40 :b #x40 :a #x80)))
|
|
(dotimes (gp-0 (-> *level* length))
|
|
(let ((s5-0 (-> *level* level gp-0)))
|
|
(when (= (-> s5-0 status) 'active)
|
|
(compute-memory-usage s5-0 #f)
|
|
(format *stdcon*
|
|
"~0k~D ~A ~,,2fK + textures~%"
|
|
(-> s5-0 index)
|
|
(-> s5-0 name)
|
|
(* 0.0009765625 (the float (-> s5-0 mem-usage)))))))
|
|
;; print all stats
|
|
(format *stdcon* "~0k~%grps frags tris dverts strip insts~%")
|
|
(print-tr-stat (-> *terrain-stats* pris) "pris" *temp-string*)
|
|
(print-tr-stat (-> *merc-global-stats* merc) "merc" *temp-string*)
|
|
(print-tr-stat (-> *merc-global-stats* mercneric) "mercneric" *temp-string*)
|
|
(print-tr-stat (-> *terrain-stats* tie-near) "tie-near" *temp-string*)
|
|
(print-tr-stat (-> *terrain-stats* tie) "tie" *temp-string*)
|
|
(print-tr-stat (-> *terrain-stats* tie-generic) "tie-generic" *temp-string*)
|
|
(print-tr-stat (-> *terrain-stats* shrub-near) "shrub-near" *temp-string*)
|
|
(print-tr-stat (-> *terrain-stats* shrub) "shrub" *temp-string*)
|
|
(print-tr-stat (-> *terrain-stats* tfrag-near) "tfrag-near" *stat-string-tfrag-near*)
|
|
(print-tr-stat (-> *terrain-stats* tfrag) "tfrag" *stat-string-tfrag*)
|
|
(print-tr-stat (-> *terrain-stats* trans-tfrag) "trans-tfrag" *temp-string*)
|
|
(print-tr-stat (-> *terrain-stats* trans-tfrag-near) "trans-tfrag-near" *temp-string*)
|
|
(print-tr-stat (-> *terrain-stats* trans-pris) "trans-pris" *temp-string*)
|
|
(print-tr-stat (-> *terrain-stats* billboard) "billboard" *temp-string*)
|
|
(print-tr-stat (-> *terrain-stats* trans-shrub) "trans-shrub" *temp-string*)
|
|
(print-tr-stat (-> *terrain-stats* ocean-mid) "ocean-mid" *temp-string*)
|
|
(print-tr-stat (-> *terrain-stats* ocean-near) "ocean-near" *temp-string*)
|
|
(format *stdcon* "~0k---------------------------------------------------------------~%")
|
|
(print-tr-stat (-> *terrain-stats* total) "total" *stat-string-total*)
|
|
(clear-tr-stat (-> *terrain-stats* pris))
|
|
(clear-tr-stat (-> *merc-global-stats* merc))
|
|
(clear-tr-stat (-> *merc-global-stats* mercneric))
|
|
(clear-tr-stat (-> *terrain-stats* shrub-near))
|
|
(clear-tr-stat (-> *terrain-stats* tie-near))
|
|
(clear-tr-stat (-> *terrain-stats* tie))
|
|
(clear-tr-stat (-> *terrain-stats* tie-generic))
|
|
(clear-tr-stat (-> *terrain-stats* shrub))
|
|
(clear-tr-stat (-> *terrain-stats* tfrag-near))
|
|
(clear-tr-stat (-> *terrain-stats* tfrag))
|
|
(clear-tr-stat (-> *terrain-stats* trans-tfrag))
|
|
(clear-tr-stat (-> *terrain-stats* trans-tfrag-near))
|
|
(clear-tr-stat (-> *terrain-stats* trans-pris))
|
|
(clear-tr-stat (-> *terrain-stats* billboard))
|
|
(clear-tr-stat (-> *terrain-stats* trans-shrub))
|
|
(clear-tr-stat (-> *terrain-stats* ocean-mid))
|
|
(clear-tr-stat (-> *terrain-stats* ocean-near))
|
|
(clear-tr-stat (-> *terrain-stats* total))
|
|
(if *debug-segment*
|
|
(add-frame (-> *display* frames (-> *display* on-screen) frame profile-bar 0) 'draw (new 'static 'rgba :b #xff :a #x80)))
|
|
0
|
|
(none))
|
|
|
|
(defun update-subdivide-settings! ((settings subdivide-settings) (math-cam math-camera) (idx int))
|
|
"Change the subdivide settings."
|
|
(set! (-> settings meters 0) (-> settings far idx))
|
|
(set! (-> settings meters 4) (-> settings close idx))
|
|
(let ((f0-3 (* 0.14285715 (- (-> settings meters 0) (-> settings meters 4)))))
|
|
(set! (-> settings meters 3) (+ (-> settings meters 4) (* 0.5 f0-3)))
|
|
(set! (-> settings meters 2) (+ (-> settings meters 3) f0-3))
|
|
(set! (-> settings meters 1) (+ (-> settings meters 2) (* 2.0 f0-3))))
|
|
(let ((f0-7 (/ (-> math-cam inv-hmge-scale w) (-> math-cam d))))
|
|
(dotimes (v1-5 5)
|
|
(set! (-> settings dist v1-5) (* f0-7 (-> settings meters v1-5)))))
|
|
(set! (-> *tfrag-work* frag-dists x) (- (-> settings meters 0)))
|
|
(set! (-> *tfrag-work* frag-dists y) (- (-> settings meters 1)))
|
|
(set! (-> *tfrag-work* frag-dists z) (- (-> settings meters 2)))
|
|
(set! (-> *tfrag-work* frag-dists w) (- (-> settings meters 4)))
|
|
0
|
|
(none))
|
|
|
|
(define *subdivide-settings* (new 'global 'subdivide-settings (meters 30) (meters 70)))
|
|
|
|
(defun set-tfrag-dists! ((arg0 tfrag-dists))
|
|
(let ((f2-0 (-> *subdivide-settings* dist 0))
|
|
(f1-0 (-> *subdivide-settings* dist 1))
|
|
(f0-0 (-> *subdivide-settings* dist 2)))
|
|
(set! (-> arg0 k0s 0 w) f2-0)
|
|
(set! (-> arg0 k0s 1 w) f1-0)
|
|
(let ((f4-1 (/ 1.0 (- f2-0 f1-0)))
|
|
(f3-2 (/ 1.0 (- f1-0 f0-0))))
|
|
(set! (-> arg0 k0s 0 y) (- f4-1))
|
|
(set! (-> arg0 k0s 1 y) (- f3-2))
|
|
(set! (-> arg0 k0s 0 x) (* 0.5 f4-1))
|
|
(set! (-> arg0 k0s 1 x) (* 0.5 f3-2))
|
|
(let ((f2-1 (* f2-0 f4-1))
|
|
(f5-7 (* f1-0 f3-2)))
|
|
(set! (-> arg0 k1s 0 y) f2-1)
|
|
(set! (-> arg0 k1s 1 y) f5-7))
|
|
(set! (-> arg0 k1s 0 x) (* -0.5 f4-1 f1-0))
|
|
(set! (-> arg0 k1s 1 x) (* -0.5 f3-2 f0-0))))
|
|
(none))
|
|
|
|
(define *terrain-context* (new 'global 'terrain-context))
|
|
|
|
;; oops, this runs even when not debugging and ends up on global.
|
|
(define *perf-stats* (new 'debug 'perf-stat-array 17))
|
|
|
|
(defmethod print-to-stream ((this perf-stat) (arg0 string) (arg1 basic))
|
|
"Print performance info to a stream. But the stream is ignored and it is
|
|
printed to the screen."
|
|
(format *stdcon*
|
|
"~3d ~8d ~8d ~6d ~6d"
|
|
(-> this count)
|
|
(-> this cycles)
|
|
(-> this instructions)
|
|
(-> this icache)
|
|
(-> this dcache))
|
|
(format *stdcon* " ~2d ~2d ~2d" (-> this to-vu0-waits) (-> this to-spr-waits) (-> this from-spr-waits))
|
|
(format *stdcon* " ~s~%" arg0)
|
|
(none))
|
|
|
|
(defenum perf-stat-bucket
|
|
(all-code 0)
|
|
(mercneric 1)
|
|
(tie-generic 2)
|
|
(background 3)
|
|
(drawable 4)
|
|
(tfrag 5)
|
|
(tfrag-near 6)
|
|
(inst-shrub 7)
|
|
(proto-shrub 8)
|
|
(inst-tie 9)
|
|
(proto-tie-g 10)
|
|
(proto-tie 11)
|
|
(proto-tie-n 12)
|
|
(bones 13)
|
|
(nav 14)
|
|
(collide 15)
|
|
(camera 16))
|
|
|
|
(defun-debug perf-stat-bucket->string ((arg0 perf-stat-bucket))
|
|
(enum->string perf-stat-bucket arg0))
|
|
|
|
;; Set up for the GOMI STATS HACK
|
|
(define GSH_ENABLE #f)
|
|
|
|
(define GSH_BUCKET (bucket-id sky-draw))
|
|
|
|
(define GSH_WHICH_STAT 1)
|
|
|
|
(define GSH_MAX_DISPLAY (the-as basic #f))
|
|
|
|
(define GSH_TIME 64)
|
|
|
|
(define *gomi-stats-hack* (the-as (inline-array perf-stat) (malloc 'debug (* 52 (+ GSH_TIME 1)))))
|
|
|
|
(defun-debug start-perf-stat-collection ()
|
|
(let ((frame-idx (+ (-> *perf-stats* data 0 frame-number) 1)))
|
|
(set! (-> *perf-stats* data 0 frame-number) frame-idx)
|
|
(let ((gp-0 (mod frame-idx (the-as uint 34))))
|
|
(when GSH_ENABLE
|
|
(let ((bucket GSH_BUCKET))
|
|
(let ((which-stat GSH_WHICH_STAT)) (set! gp-0 (+ (* (the-as uint bucket) 2) which-stat)))
|
|
(when GSH_MAX_DISPLAY
|
|
(let ((stat-idx (logand (-> *perf-stats* data 0 frame-number) (+ GSH_TIME -1))))
|
|
(set! (-> *gomi-stats-hack* stat-idx cycles) (-> *perf-stats* data (the-as int bucket) cycles))
|
|
(set! (-> *gomi-stats-hack* stat-idx instructions) (-> *perf-stats* data (the-as int bucket) instructions))
|
|
(set! (-> *gomi-stats-hack* stat-idx icache) (-> *perf-stats* data (the-as int bucket) icache))
|
|
(set! (-> *gomi-stats-hack* stat-idx dcache) (-> *perf-stats* data (the-as int bucket) dcache))
|
|
(when (zero? stat-idx)
|
|
(set! (-> *gomi-stats-hack* GSH_TIME cycles) (the-as uint 0))
|
|
(set! (-> *gomi-stats-hack* GSH_TIME instructions) (the-as uint 0))
|
|
(set! (-> *gomi-stats-hack* GSH_TIME icache) (the-as uint 0))
|
|
(set! (-> *gomi-stats-hack* GSH_TIME dcache) (the-as uint 0))
|
|
(dotimes (v1-22 GSH_TIME)
|
|
(if (< (-> *gomi-stats-hack* GSH_TIME cycles) (-> *gomi-stats-hack* v1-22 cycles))
|
|
(set! (-> *gomi-stats-hack* GSH_TIME cycles) (-> *gomi-stats-hack* v1-22 cycles)))
|
|
(if (< (-> *gomi-stats-hack* GSH_TIME instructions) (-> *gomi-stats-hack* v1-22 instructions))
|
|
(set! (-> *gomi-stats-hack* GSH_TIME instructions) (-> *gomi-stats-hack* v1-22 instructions)))
|
|
(if (< (-> *gomi-stats-hack* GSH_TIME icache) (-> *gomi-stats-hack* v1-22 icache))
|
|
(set! (-> *gomi-stats-hack* GSH_TIME icache) (-> *gomi-stats-hack* v1-22 icache)))
|
|
(if (< (-> *gomi-stats-hack* GSH_TIME dcache) (-> *gomi-stats-hack* v1-22 dcache))
|
|
(set! (-> *gomi-stats-hack* GSH_TIME dcache) (-> *gomi-stats-hack* v1-22 dcache))))))
|
|
(format *stdcon* "~%")
|
|
(print-to-stream (-> *gomi-stats-hack* GSH_TIME) "max-value" *stdcon*))))
|
|
(dotimes (v1-27 17)
|
|
(set! (-> *perf-stats* data v1-27 count) (the-as uint 0))
|
|
(cond
|
|
((!= v1-27 (shr gp-0 1)) (set! (-> *perf-stats* data v1-27 ctrl) (the-as uint 0)) 0)
|
|
(else
|
|
(let ((a1-63 (logand gp-0 1))
|
|
(a0-64 (the-as uint #x80004010)))
|
|
(cond
|
|
((zero? a1-63) (set! a0-64 (the-as uint (+ #x60020 a0-64))))
|
|
((= a1-63 1) (set! a0-64 (the-as uint (+ #x300c0 a0-64)))))
|
|
(set! (-> *perf-stats* data v1-27 select) a1-63)
|
|
(set! (-> *perf-stats* data v1-27 ctrl) a0-64))
|
|
(set! (-> *perf-stats* data v1-27 accum0) (the-as uint 0))
|
|
(set! (-> *perf-stats* data v1-27 accum1) (the-as uint 0))
|
|
(set! (-> *perf-stats* data v1-27 to-vu0-waits) (the-as uint 0))
|
|
(set! (-> *perf-stats* data v1-27 to-spr-waits) (the-as uint 0))
|
|
(set! (-> *perf-stats* data v1-27 from-spr-waits) (the-as uint 0))
|
|
0)))))
|
|
(let* ((v1-31 (-> *perf-stats* data))
|
|
(a0-76 (-> v1-31 0 ctrl)))
|
|
(+! (-> v1-31 0 count) 1)
|
|
(b! (zero? a0-76) cfg-28 :delay (nop!))
|
|
(set! *pc-perf-stat-counter* (get-cpu-clock)) ;; patched
|
|
#|
|
|
(.mtc0 Perf 0)
|
|
(.sync.l)
|
|
(.sync.p)
|
|
(.mtpc pcr0 0)
|
|
(.mtpc pcr1 0)
|
|
(.sync.l)
|
|
(.sync.p)
|
|
(.mtc0 Perf a0-76)
|
|
|#
|
|
)
|
|
(.sync.l)
|
|
(.sync.p)
|
|
(label cfg-28)
|
|
0
|
|
0
|
|
(none))
|
|
|
|
(defun-debug end-perf-stat-collection ()
|
|
(local-vars (a0-1 int) (a0-3 int))
|
|
(let ((v1-1 (-> *perf-stats* data)))
|
|
(b! (zero? (-> v1-1 0 ctrl)) cfg-2)
|
|
;;(.mtc0 Perf r0-0)
|
|
(.sync.l)
|
|
(.sync.p)
|
|
;;(.mfpc a0-1 pcr0)
|
|
;; (+! (-> v1-1 0 accum0) (the-as uint a0-1))
|
|
(+! (-> v1-1 0 accum0) (- (get-cpu-clock) *pc-perf-stat-counter*)) ;; patched
|
|
;;(.mfpc a0-3 pcr1)
|
|
;; (+! (-> v1-1 0 accum1) (the-as uint a0-3))
|
|
(set! (-> v1-1 0 accum1) 0) ;; ;; patched
|
|
)
|
|
(label cfg-2)
|
|
0
|
|
(dotimes (v1-3 17)
|
|
(when (nonzero? (-> *perf-stats* data v1-3 ctrl))
|
|
(let ((a2-0 (-> *perf-stats* data v1-3 select))
|
|
(a1-8 (-> *perf-stats* data v1-3 accum0))
|
|
(a0-15 (-> *perf-stats* data v1-3 accum1)))
|
|
(cond
|
|
((zero? a2-0) (set! (-> *perf-stats* data v1-3 cycles) a1-8) (set! (-> *perf-stats* data v1-3 instructions) a0-15))
|
|
((= a2-0 1) (set! (-> *perf-stats* data v1-3 icache) a1-8) (set! (-> *perf-stats* data v1-3 dcache) a0-15))))))
|
|
0
|
|
(none))
|
|
|
|
(defun-debug print-perf-stats ()
|
|
(format *stdcon* "~0k~%count cycles instr icache dcache vu0/to/from~%")
|
|
(dotimes (gp-0 17)
|
|
(if (nonzero? (-> *perf-stats* data gp-0 count))
|
|
(print-to-stream (-> *perf-stats* data gp-0) (perf-stat-bucket->string (the-as perf-stat-bucket gp-0)) *stdcon*)))
|
|
0
|
|
(none))
|