np/hdl-unit-test-suite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add verbose output for iverilog and vvp

Browse Source
This commit is contained in:
Nikolay Puzanov 2022-08-15 16:52:49 +03:00
parent f4fa7c5724
commit e667b0657d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utest.scm
View File

@ -483,6 +483,7 @@
(warnings "all") ; -W (warnings "all") ; -W
(defines '()) ; -D=X (defines '()) ; -D=X
(parameters '()) ; -P=X (parameters '()) ; -P=X
(verbose #f)
(other '())) (other '()))
(define (string-or-num-param x) (define (string-or-num-param x)
@ -494,6 +495,7 @@
(cons (cons
iverilog-executable iverilog-executable
(append (append
(if verbose '("-v") '())
(if lang (list (format "-g~a" lang)) '()) (if lang (list (format "-g~a" lang)) '())
(if output (list "-o" output) '()) (if output (list "-o" output) '())
(if separate '("-u") '()) (if separate '("-u") '())
@ -536,11 +538,13 @@
(vpipaths '()) ; -M (vpipaths '()) ; -M
(vpimods '()) ; -m (vpimods '()) ; -m
(dumpformat 'fst) (dumpformat 'fst)
(plusargs '())) (plusargs '())
(verbose #f))
(let ((opts (let ((opts
(cons (cons
vvp-executable vvp-executable
(append (append
(if verbose '("-v") '())
(map (lambda (x) (format "-M~a" x)) (arg-to-list vpipaths)) (map (lambda (x) (format "-M~a" x)) (arg-to-list vpipaths))
(map (lambda (x) (format "-m~a" x)) (arg-to-list vpimods)) (map (lambda (x) (format "-m~a" x)) (arg-to-list vpimods))
(list "-N" vvp-binary) ; $finish on CTRL-C (list "-N" vvp-binary) ; $finish on CTRL-C
@ -713,7 +717,7 @@
#:top top #:other `("-s" ,TIMEOUT_MODULE_NAME "-s" ,DUMP_MODULE_NAME) #:top top #:other `("-s" ,TIMEOUT_MODULE_NAME "-s" ,DUMP_MODULE_NAME)
#:output execfile #:lang lang #:features features #:vpipaths vpipaths #:output execfile #:lang lang #:features features #:vpipaths vpipaths
#:vpimods vpimods #:separate separate #:warnings warnings #:defines defines #:vpimods vpimods #:separate separate #:warnings warnings #:defines defines
#:parameters parameters))) #:parameters parameters #:verbose (utest/verbose))))
;; Print iverilog command line and output ;; Print iverilog command line and output
(printf "$ ~a\n" cmdl) (printf "$ ~a\n" cmdl)
@ -728,7 +732,7 @@
(iverilog-run execfile (iverilog-run execfile
#:vvp-executable vvp-executable #:vpipaths vpipaths #:vvp-executable vvp-executable #:vpipaths vpipaths
#:vpimods vpimods #:dumpformat (if dump dumpformat 'none) #:vpimods vpimods #:dumpformat (if dump dumpformat 'none)
#:plusargs plusargs))) #:plusargs plusargs #:verbose (utest/verbose))))
(let ((succ (if succ (check-log outp) succ))) (let ((succ (if succ (check-log outp) succ)))
(if (or succ dump (not (utest/restart-dump))) (if (or succ dump (not (utest/restart-dump)))
(begin (begin