Building runtime with debugging symbols (#96)

* building runtime with debugging symbols

* fix a bug in inlining monotonic operations

* adding profiled runtime

Author: deyaaeldeen

main.rkt

@@ -2,13 +2,21 @@
 #lang racket/base
 
 (require "src/compile.rkt"
+         "src/backend-c/runtime-location.rkt"
 	 racket/cmdline
 	 racket/match
 	 racket/runtime-path
 	 racket/system)
 
 (provide (all-from-out "src/compile.rkt"))
 
+(define (make-runtime-with-param param param_runtime.o-path)
+  (when (not (directory-exists? param_runtime.o-path))
+    (define-values (pwd _1 _2) (split-path runtime.o-path))
+    (parameterize ([current-directory pwd])
+      (unless (system (string-append "make " param) #:set-pwd? #t)
+        (printf (format "\nError: Running make failed in ~a" pwd))))))
+
 (define-runtime-path this-dir ".")
 (define (print-version-info)
  (unless (system "git rev-parse --verify HEAD" #:set-pwd? this-dir)
@@ -169,12 +177,6 @@
                                            #:mode 'text
                                            #:exists 'replace))
          (grift-log-port of-port)]))]
-   [("-g" "--with-debug-symbols")
-    "Invoke c compiler so that debugging symbols are retained."
-    (c-flags (cons "-g" (c-flags)))]
-   [("--profile")
-    "Invoke c compiler with profiling flags"
-    (c-flags (cons "-pg" (c-flags)))]
    [("--no-inline-proxied-branch")
     "Do not inline proxied operations"
     (inline-proxied-branch? #f)]
@@ -187,6 +189,17 @@
    #:once-any
    ["--Boehm" "Use Boehm Conservative Collector" (garbage-collector 'Boehm)]
    ["--No-GC" "Do not Collect Garbage"           (garbage-collector 'None)]
+   #:once-any
+   [("-g" "--with-debug-symbols")
+    "Invoke c compiler so that debugging symbols are retained."
+    (c-flags (cons "-g" (c-flags)))
+    (make-runtime-with-param "debug" debug_runtime.o-path)
+    (runtime-path debug_runtime.o-path)]
+   [("-p" "--profile")
+    "Invoke c compiler with profiling flags"
+    (c-flags (cons "-pg" (c-flags)))
+    (make-runtime-with-param "profile" profile_runtime.o-path)
+    (runtime-path profile_runtime.o-path)]
    #:args args
    (match args
      [(list)

src/backend-c/runtime-location.rkt

@@ -8,12 +8,15 @@
 
 ;; primitive functions implemented in c
 (: runtime.o-path Path)
-(: runtime.c-path Path)
 (: runtime.h-path Path)
 (define-runtime-path runtime.o-path "runtime/runtime.o")
-(define-runtime-path runtime.c-path "runtime/runtime.c")
 (define-runtime-path runtime.h-path "runtime/runtime.h")
 
+(: debug_runtime.o-path Path)
+(: profile_runtime.o-path Path)
+(define-runtime-path debug_runtime.o-path "runtime/debug_object/runtime.o")
+(define-runtime-path profile_runtime.o-path "runtime/profile_object/runtime.o")
+
 ;; hashcons implementation in c
 (: hashcons.o-path Path)
 (: hashcons.c-path Path)

src/backend-c/runtime/Makefile

@@ -2,7 +2,9 @@ NDEBUG ?= -D NDEBUG
 
 all : libgc nonegc.o runtime.o castprofiler.o
 
-debug: tidy ndebug all
+debug: tidy ndebug libgc nonegc.o debug_object/runtime.o castprofiler.o
+
+profile: tidy ndebug libgc nonegc.o profile_object/runtime.o castprofiler.o
 
 libgc : boehm-gc-install/lib/libgc.a
 
@@ -22,6 +24,24 @@ boehm-gc-install/lib/libgc.a :
 runtime.o : boehm-gc-install/lib/libgc.a io.o assoc_stack.o hashcons.o suspended_cast.o cast_queue.o
 	ld -r $^ -o $@
 
+debug_object/%.o : %.c debug_object
+	cc -Iboehm-gc-install/include -std=c99 -g $< -c -o $@
+
+debug_object:
+	mkdir $@
+
+debug_object/runtime.o : boehm-gc-install/lib/libgc.a debug_object/io.o debug_object/assoc_stack.o debug_object/hashcons.o debug_object/suspended_cast.o debug_object/cast_queue.o
+	ld -r $^ -o $@
+
+profile_object/%.o : %.c profile_object
+	cc -Iboehm-gc-install/include -std=c99 -pg $< -c -o $@
+
+profile_object:
+	mkdir $@
+
+profile_object/runtime.o : boehm-gc-install/lib/libgc.a profile_object/io.o profile_object/assoc_stack.o profile_object/hashcons.o profile_object/suspended_cast.o profile_object/cast_queue.o
+	ld -r $^ -o $@
+
 test : runtime.o
 	cd tests && make all && ./tests
 

src/casts/interpret-casts-common.rkt

@@ -598,7 +598,7 @@ TODO write unit tests
     (mref-state-reduction-uid? mref-state-reduction-uid))
   (define (mref-state-reduction)
     (if (monotonic-cast-inline-without-types?)
-        (code-gen-mref-state-reduction)
+        (begin$ (code-gen-mref-state-reduction) ZERO-EXPR)
         (let ([uid? (mref-state-reduction-uid?)])
           (or uid? (make-code!))
           (interp-mref-state-reduction))))
@@ -636,7 +636,7 @@ TODO write unit tests
     (mvect-state-reduction-uid? mvect-state-reduction-uid))
   (define (mvect-state-reduction)
     (if (monotonic-cast-inline-without-types?)
-        (code-gen-mvect-state-reduction)
+        (begin$ (code-gen-mvect-state-reduction) ZERO-EXPR)
         (let ([uid? (mvect-state-reduction-uid?)])
           (or uid? (make-code!))
           (interp-mvect-state-reduction))))