Version bump

Changes

@@ -3,6 +3,27 @@ Revision history for Verilator
 The contributors that suggested a given feature are shown in [].  [by ...]
 indicates the contributor was also the author of the fix; Thanks!
 
+* Verilator 3.822 2011/10/20
+
+***  Support $ceil, $floor, etc.  [Alex Solomatnikov]
+
+***  Add configure options for cc warnings and extended tests.  [Ruben Diez]
+
+***  Add -Wall reporting ASSIGNDLY on assignment delays.  [Ruben Diez]
+
+***  Fix UNDRIVEN warnings inside DPI import functions.  [Ruben Diez]
+
+***  Fix --help output to go to stderr, not stdout, bug397.  [Ruben Diez]
+
+**** Fix DPI import output of 64 bits, bug398. [Mike Denio]
+
+**** Fix DPI import false BLKSEQ warnings.  [Alex Solomatnikov]
+
+**** Fix MSVC compile warning with trunc/round, bug394. [Amir Gonnen]
+
+**** Fix autoconf and Makefile warnings, bug396.  [Ruben Diez]
+
+
 * Verilator 3.821 2011/09/14
 
 **** Fix PowerPC runtime error, bug288. [Ahmed El-Mahmoudy]

MANIFEST.SKIP

@@ -24,6 +24,8 @@ src/Makefile_obj$
 include/verilated.mk$
 config.cache$
 config.status$
+verilator.log
+verilator.tex
 verilator_bin.*
 .vcsmx_rebuild$
 autom4te\.cache/

Makefile.in

@@ -88,7 +88,10 @@ pkgdatadir = @pkgdatadir@
 datarootdir = @datarootdir@
 
 # Compile options
+CFG_WITH_CCWARN = @CFG_WITH_CCWARN@
 CFG_WITH_DEFENV = @CFG_WITH_DEFENV@
+CFG_WITH_LONGTESTS = @CFG_WITH_LONGTESTS@
+PACKAGE_VERSION = @PACKAGE_VERSION@
 
 #### End of system configuration section. ####
 ######################################################################
@@ -101,8 +104,6 @@ INFOS = README internals.txt verilator.txt verilator.html verilator.1 verilator.
 
 # Files that can be generated, but should be up to date for a distribution.
 DISTDEP = info Makefile
-# Files to distribute.
-DISTBIN = $(wildcard bin/verilator-*)
 
 DISTFILES_INC = $(INFOS) .gitignore Artistic COPYING COPYING.LESSER \
 	*.in *.ac \
@@ -129,7 +130,6 @@ DISTFILES_INC = $(INFOS) .gitignore Artistic COPYING COPYING.LESSER \
 	test_regress/t/*.pl \
 	test_regress/t/*.pf \
 	test_regress/t/*.v* \
-	verilator.* \
 
 INST_PROJ_FILES = \
 	bin/verilator \
@@ -171,7 +171,7 @@ msg_test:
 	@echo
 
 .PHONY:test
-ifeq ($(VERILATOR_AUTHOR_SITE),1)	# Local... Else don't burden users
+ifeq ($(CFG_WITH_LONGTESTS),yes)	# Local... Else don't burden users
 test: test_vcs test_c test_sc test_sp test_verilated test_regress
 else
 test: test_c test_sc test_sp
@@ -203,17 +203,18 @@ test_regress: all_nomsg
 info: $(INFOS)
 
 # Use --no-split to avoid creating filenames > 14 chars.
-verilator.1: bin/verilator
+verilator.1: ${srcdir}/bin/verilator
 	pod2man $< $@
 
-verilator.txt: bin/verilator
+verilator.txt: ${srcdir}/bin/verilator
 	$(POD2TEXT) $< $@
 
-verilator.html: bin/verilator
+verilator.html: ${srcdir}/bin/verilator
 	pod2html $< >$@
 
-verilator.pdf: bin/verilator $(DISTCONFIG)
-	pod2latex --full --out verilator.tex bin/verilator
+# PDF needs DIST variables; but having configure.ac as dependency isn't detected
+verilator.pdf: ${srcdir}/bin/verilator Makefile
+	pod2latex --full --out verilator.tex ${srcdir}/bin/verilator
 	cat < verilator.tex \
 	   | sed 's/\\begin{document}/\\usepackage[left=1.7in,right=1.7in,top=1.3in,bottom=1.3in]{geometry}\n\\begin{document}/' \
 	   | sed 's/\\begin{document}/\\usepackage[pdftex,bookmarks=true,bookmarksnumbered=true,hypertexnames=false,breaklinks=true,linkbordercolor={0 0 1}]{hyperref}\n\\begin{document}/' \
@@ -257,7 +258,7 @@ VL_INST_DATA_SRCDIR_FILES = \
 	test_v/*.[chv]* \
 	test_c/*.[chv]*   test_c/Makefile  test_c/Makefile_obj  \
 	test_sc/*.[chv]*  test_sc/Makefile test_sc/Makefile_obj \
-	test_sp/*.[chv]*  test_sp/Makefile test_sp/Makefile_obj \
+	                  test_sp/Makefile test_sp/Makefile_obj \
 
 installbin:
 	$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(bindir)
@@ -268,9 +269,11 @@ installbin:
 	$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(pkgdatadir)/bin
 	( cd ${srcdir}/bin ; $(INSTALL_PROGRAM) verilator_includer $(DESTDIR)$(pkgdatadir)/bin/verilator_includer )
 
+# Man files can either be part of the original kit, or built in current directory
+# So important we use $< so VPATH is searched
 installman: $(VL_INST_MAN_FILES)
 	$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(mandir)/man1
-	for p in $(VL_INST_MAN_FILES) ; do \
+	for p in $< ; do \
 	  $(INSTALL_DATA) $$p $(DESTDIR)$(mandir)/man1/$$p; \
 	done
 
@@ -315,6 +318,8 @@ install: all_nomsg installbin installman installdata install-msg
 install-here: installman ftp
 
 ifeq ($(VERILATOR_AUTHOR_SITE),1)	# Local... Else don't burden users
+DISTNAMEREV = $(shell sed -e '/DTVERSION/!d' -e 's/.*verilator_\([^"]*\).*/\1/' -e q ${srcdir}/src/config_rev.h)
+
 DIRPROJECT := $(shell project_dir --project)
 VERILATOR_CAD_DIR = $(CAD_DIR)/verilator/$(DISTNAMEREV)/$(DIRPROJECT_ARCH)
 INST_PROJ_CVS = cp_if_cvs_diff
@@ -323,7 +328,7 @@ install-project: dist
 	@echo "Install-project to $(DIRPROJECT)"
 	strip verilator_bin*
 	$(MAKE) install-project-quick
-	for p in verilator.1 ; do \
+	for p in $(VL_INST_MAN_FILES) ; do \
 	  $(INSTALL_DATA) $$p $(DIRPROJECT_PREFIX)/man/man1/$$p; \
 	done
 	$(INST_PROJ_CVS) $(DISTNAME).tgz $(DIRPROJECT)/hw/utils/verilator/verilator.tgz
@@ -347,7 +352,7 @@ install-cadtools: dist
 	strip verilator_bin*
 	$(MAKE) install-cadtools-quick
 	$(SHELL) ${srcdir}/mkinstalldirs $(VERILATOR_CAD_DIR)/man/man1
-	for p in verilator.1 ; do \
+	for p in $(VL_INST_MAN_FILES) ; do \
 	  $(INSTALL_DATA) $$p $(VERILATOR_CAD_DIR)/man/man1/$$p; \
 	done
 	$(INST_PROJ_CVS) $(DISTNAME).tgz $(VERILATOR_CAD_DIR)/verilator.tgz
@@ -400,8 +405,13 @@ Makefile: Makefile.in config.status $(IN_WILD)
 src/Makefile: src/Makefile.in Makefile
 config.status: configure
 	./config.status --recheck
+
 configure: configure.ac
+ifeq ($(CFG_WITH_CCWARN),yes)	# Local... Else don't burden users
+	autoconf --warnings=all
+else
 	autoconf
+endif
 
 maintainer-clean::
 	@echo "This command is intended for maintainers to use;"
@@ -442,15 +452,12 @@ dist-file-list:
 ######################################################################
 # Distributions
 
-DISTCONFIG = ${srcdir}/src/config_build.h.in
-
-DISTTITLE := $(shell sed -e '/DTVERSION/!d' -e 's/[^0-9]*\([0-9.a-z]*\).*/verilator-\1/' -e 's/v/V/' -e q $(DISTCONFIG))
-DISTNAME := $(shell sed -e '/DTVERSION/!d' -e 's/[^0-9]*\([0-9.a-z]*\).*/verilator-\1/' -e q $(DISTCONFIG))
-DISTDATEPRE := $(shell sed -e '/DTVERSION/!d' -e 's/.*\([1-2][0-9][0-9][0-9].[0-9]*[0-9].[0-9]*[0-9]\).*/\1/' -e q $(DISTCONFIG))
-DISTNAMEREV := $(shell sed -e '/DTVERSION/!d' -e 's/.*verilator_\([^"]*\).*/\1/' -e q src/config_rev.h)
+DISTTITLE := Verilator $(word 1,$(PACKAGE_VERSION))
+DISTNAME := verilator-$(word 1,$(PACKAGE_VERSION))
+DISTDATEPRE := $(word 2,$(PACKAGE_VERSION))
+DISTDATE := $(subst /,-,$(DISTDATEPRE))
 
 DISTTAGNAME := $(subst .,_,$(subst -,_,$(DISTNAME)))
-DISTDATE := $(subst /,-,$(DISTDATEPRE))
 
 tag:
 	svnorcvs tag $(DISTTAGNAME)

bin/verilator

@@ -70,7 +70,7 @@ if (! GetOptions (
 		  # "version!"	=> \&version,	# Also passthru'ed
 		  # Switches
 		  "gdb=s"	=> \$opt_gdb,	# Undocumented debugging
-		  "gdbbt!"	=> \$opt_gdbbt,	# Undocumented debugging
+		  "gdbbt!"	=> \$opt_gdbbt,
 		  # Additional parameters
 		  "<>"		=> sub {},	# Ignored
 		  )) {
@@ -99,7 +99,7 @@ if ($opt_gdbbt && !$opt_gdb && $Debug) {
 #----------------------------------------------------------------------
 
 sub usage {
-    pod2usage(-exitstatus=>2, -verbose=>2);
+    pod2usage(-verbose=>2, -exitval=>2, -output=>\*STDOUT);
 }
 
 sub debug {
@@ -125,7 +125,14 @@ sub verilator_bin {
 	    $bin = "$dir/$basename";  # From pointing to kit directory
 	}
     } else {
-	$bin = $basename;
+	if (-x "$RealBin/$basename") {
+	    $bin = "$RealBin/$basename";  # From path/to/verilator with verilator_bin installed
+	} else {
+	    $bin = $basename;  # Find in PATH
+	}
+	# Note we don't look under bin/$basename which would be right if running
+	# in the kit dir. Running that would likely break, since
+	# VERILATOR_ROOT wouldn't be set and Verilator won't find internal files.
     }
     return $bin;
 }
@@ -936,8 +943,8 @@ enabled), but do not affect style messages.  This is equivalent to
 =item -Wwarn-style
 
 Enable all code style related warning messages.  This is equivalent to
-"-Wwarn-DECLFILENAME -Wwarn-DEFPARAM -Wwarn-INCABSPATH -Wwarn-SYNCASYNCNET
--Wwarn-UNDRIVEN -Wwarn-UNUSED -Wwarn-VARHIDDEN".
+"-Wwarn ASSIGNDLY -Wwarn-DECLFILENAME -Wwarn-DEFPARAM -Wwarn-INCABSPATH
+-Wwarn-SYNCASYNCNET -Wwarn-UNDRIVEN -Wwarn-UNUSED -Wwarn-VARHIDDEN".
 
 =item -x-assign 0
 
@@ -1226,11 +1233,6 @@ all runs of the C++ Compiler.  For example, "objcache --read --write", or
 "ccache".  If using distcc, it would generally be run under either objcache
 or ccache; see the documentation for those programs.
 
-=item OBJCACHE_JOBS
-
-Optionally lists Make flags that specifies parallel make jobs.  For example
-a 4 CPU system may use "-j 6" to request 6 parallel compiles when making.
-
 =item SYSTEMC
 
 Required for SystemC output mode.  If set, specifies the directory
@@ -2375,6 +2377,18 @@ List of all warnings:
 
 =over 4
 
+=item ASSIGNDLY
+
+Warns that you have an assignment statement with a delayed time in front of
+it, for example:
+
+    a <= #100 b;
+    assign #100 a = b;
+
+Ignoring this warning may make Verilator simulations differ from other
+simulators, however at one point this was a common style so disabled by
+default as a code style warning.
+
 =item BLKANDNBLK
 
 BLKANDNBLK is an error that a variable comes from a mix of blocked and
@@ -3145,10 +3159,9 @@ Between GCC 3.0 to 3.3, each compiled progressively slower, thus if you can
 use GCC 2.95, or GCC 3.4 you'll have faster builds.  Two ways to cheat are
 to compile on parallel machines and avoid compilations altogether.  See the
 --output-split option, and the web for the ccache, distcc and icecream
-packages, and the Make::Cache package available from
-L<http://www.veripool.org/>. Make::Cache will skip GCC runs between
-identical source builds, even across different users.  You can use the
-OBJCACHE environment variable to use these CC wrappers.
+packages. ccache will skip GCC runs between identical source builds, even
+across different users.  You can use the OBJCACHE environment variable to
+use these CC wrappers.
 
 =item Why do so many files need to recompile when I add a signal?
 

bin/verilator_difftree

@@ -99,7 +99,7 @@ sub filter {
 	next if $line =~ / This=/;
 	$line =~ s/0x[a-f0-9]+/0x/g;
 	$line =~ s/<e[0-9]+\#?>/<e>/g;
-	$line =~ s/{\d+}/{}/g if !$Opt_Lineno;
+	$line =~ s/{[a-z]*\d+}/{}/g if !$Opt_Lineno;
 	print $f2 $line;
     }
     $f1->close;
@@ -109,7 +109,7 @@ sub filter {
 #----------------------------------------------------------------------
 
 sub usage {
-    pod2usage(-verbose=>2, -exitval => 2);
+    pod2usage(-verbose=>2, -exitval=>2, -output=>\*STDOUT);
     exit (1);
 }
 

bin/verilator_profcfunc

@@ -39,7 +39,7 @@ profcfunc($Opt_File);
 #----------------------------------------------------------------------
 
 sub usage {
-    pod2usage(-verbose=>2, -exitval => 2);
+    pod2usage(-verbose=>2, -exitval=>2, -output=>\*STDOUT);
     exit (1);
 }
 

configure.ac

@@ -1,35 +1,83 @@
-dnl DESCRIPTION: Process this file with autoconf to produce a configure script.
-dnl
-dnl Copyright 2003-2011 by Wilson Snyder. Verilator is free software; you can
-dnl redistribute it and/or modify it under the terms of either the GNU Lesser
-dnl General Public License Version 3 or the Perl Artistic License Version 2.0.
+# DESCRIPTION: Process this file with autoconf to produce a configure script.
+#
+# Copyright 2003-2011 by Wilson Snyder. Verilator is free software; you can
+# redistribute it and/or modify it under the terms of either the GNU Lesser
+# General Public License Version 3 or the Perl Artistic License Version 2.0.
 
-AC_INIT(src/Verilator.cpp)
+AC_INIT([Verilator],[3.823 2011/10/20])
 AC_CONFIG_HEADER(src/config_build.h)
+AC_CONFIG_FILES(Makefile src/Makefile src/Makefile_obj include/verilated.mk)
 
-dnl Special Substitutions
-AC_ARG_ENABLE(defenv,
-   [AS_HELP_STRING([--disable-defenv], [disable hardcoded default environment variables])],
-   CFG_WITH_DEFENV=$enableval,
-   CFG_WITH_DEFENV=yes)
+AC_MSG_RESULT([configuring for $PACKAGE_STRING])
+
+# Special Substitutions - CFG_WITH_DEFENV
+AC_MSG_CHECKING(whether to disable hardcoded paths)
+AC_ARG_ENABLE([defenv],
+              [AS_HELP_STRING([--disable-defenv],
+                              [disable using some hardcoded data paths extracted from some default environment variables (the default is to use hardcoded paths)])],
+              [case "${enableval}" in
+                yes) CFG_WITH_DEFENV=yes ;;
+                no)  CFG_WITH_DEFENV=no ;;
+                *)   AC_MSG_ERROR([bad value ${enableval} for --disable-defenv]) ;;
+               esac],
+              CFG_WITH_DEFENV=yes)
 AC_SUBST(CFG_WITH_DEFENV)
+AC_MSG_RESULT($CFG_WITH_DEFENV)
 
-dnl Compiler flags
+# Special Substitutions - CFG_WITH_CCWARN
+AC_MSG_CHECKING(whether to show and stop on compilation warnings)
+AC_ARG_ENABLE([ccwarn],
+              [AS_HELP_STRING([--enable-ccwarn],
+                              [enable showing and stopping on compilation warnings])],
+              [case "${enableval}" in
+                yes) CFG_WITH_CCWARN=yes ;;
+                no)  CFG_WITH_CCWARN=no ;;
+                *)   AC_MSG_ERROR([bad value ${enableval} for --enable-ccwarn]) ;;
+               esac],
+              [case "x${VERILATOR_AUTHOR_SITE}" in
+                x)   CFG_WITH_CCWARN=no ;;
+                *)   CFG_WITH_CCWARN=yes ;;
+               esac]
+	      )
+AC_SUBST(CFG_WITH_CCWARN)
+AC_MSG_RESULT($CFG_WITH_CCWARN)
+
+# Special Substitutions - CFG_WITH_LONGTESTS
+AC_MSG_CHECKING(whether to run long tests)
+AC_ARG_ENABLE([longtests],
+              [AS_HELP_STRING([--enable-longtests],
+                              [enable running long developer tests])],
+              [case "${enableval}" in
+                yes) CFG_WITH_LONGTESTS=yes ;;
+                no)  CFG_WITH_LONGTESTS=no ;;
+                *)   AC_MSG_ERROR([bad value ${enableval} for --enable-longtests]) ;;
+               esac],
+              [case "x${VERILATOR_AUTHOR_SITE}" in
+                x)   CFG_WITH_LONGTESTS=no ;;
+                *)   CFG_WITH_LONGTESTS=yes ;;
+               esac]
+	      )
+AC_SUBST(CFG_WITH_LONGTESTS)
+AC_MSG_RESULT($CFG_WITH_LONGTESTS)
+
+# Compiler flags
 CFLAGS=-I${includedir}
 CPPFLAGS=-I${includedir}
 CXXFLAGS=-I${includedir}
 LDFLAGS=-L${libdir}
 
-dnl Checks for programs.
+# Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
 
 AC_LANG_PUSH(C++)
 AC_MSG_CHECKING([that C++ compiler can compile simple program])
-AC_TRY_RUN([int main() { return 0; }],
+AC_RUN_IFELSE(
+           [AC_LANG_SOURCE([int main() { return 0; }])],
            AC_MSG_RESULT(yes),
-           AC_MSG_RESULT(no);AC_MSG_ERROR([a working C++ compiler is required]))
+           AC_MSG_RESULT(no);AC_MSG_ERROR([a working C++ compiler is required]),
+	   AC_MSG_RESULT(yes))
 
 AC_PATH_PROG(PERL,perl)
 if test "x$PERL" = "x" ; then
@@ -44,33 +92,54 @@ if test "x$YACC" = "x" ; then
    AC_MSG_ERROR([Cannot find "bison" in your PATH, please install it])
 fi
 
-dnl Checks for libraries.
+# Checks for libraries.
 
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h unistd.h inttypes.h sys/file.h sys/time.h sys/un.h math.h stdint.h mingw/stdint.h)
-
-dnl Checks for typedefs, structures
+# Checks for typedefs, structures
 AC_CHECK_TYPE(size_t,unsigned int)
-AC_CHECK_TYPE(uint_t,unsigned int)
-AC_CHECK_TYPE(ulong_t,unsigned long)
 AC_TYPE_SIZE_T
-AC_STRUCT_TM
 
-dnl Checks for compiler characteristics.
+# Checks for compiler characteristics.
 AC_C_INLINE
 
-dnl Checks for library functions.
+AC_DEFUN([_MY_CXX_CHECK_OPT],
+   [# _MY_CXX_CHECK_OPT(flag) -- Check if compiler supports specific options
+    ACO_SAVE_CXXFLAGS="$CXXFLAGS"
+    # -Werror needed otherwise unknown -Wno-div-by-zero won't report problems
+    CXXFLAGS="$CXXFLAGS $1 -Werror"
+    AC_MSG_CHECKING([whether $CXX accepts $1])
+    AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([],[])],
+	 [_my_result=yes],
+	 [_my_result=no])
+    AC_MSG_RESULT($_my_result)
+    if test "$_my_result" = "yes" ; then
+       CFG_CXXFLAGS_NO_UNUSED="$CFG_CXXFLAGS_NO_UNUSED $1"
+    fi
+    CXXFLAGS="$ACO_SAVE_CXXFLAGS"
+   ])# _MY_CXX_CHECK_OPT
 
-dnl Checks for system services
+# For example, -Wno-div-by-zero isn't in 4.1.2
+_MY_CXX_CHECK_OPT(-Wno-char-subscripts)
+# Random code often does / 0.  Unfortunately VL_DIV_I(0,0) will warn
+# without this flag, even though there's a conditional to prevent the divide.
+# We still don't add no-div-by-zero as it throws message to stdout, though doesn't die.
+#_MY_CXX_CHECK_OPT(-Wno-div-by-zero)
+_MY_CXX_CHECK_OPT(-Wno-sign-compare)
+_MY_CXX_CHECK_OPT(-Wno-uninitialized)
+_MY_CXX_CHECK_OPT(-Wno-unused-parameter)
+_MY_CXX_CHECK_OPT(-Wno-unused-variable)
+AC_SUBST(CFG_CXXFLAGS_NO_UNUSED)
 
-dnl Other install directories
+# Checks for library functions.
+
+# Checks for system services
+
+# Other install directories
 pkgdatadir=${datadir}/verilator
 AC_SUBST(pkgdatadir)
 
-AC_OUTPUT(Makefile src/Makefile src/Makefile_obj include/verilated.mk)
+AC_OUTPUT
 
 AC_MSG_RESULT([])
-AC_MSG_RESULT([Now type 'gmake'])
+AC_MSG_RESULT([Now type 'make' (or sometimes 'gmake') to build Verilator.])
 AC_MSG_RESULT([])

include/verilated.h

@@ -383,9 +383,9 @@ static inline QData  VL_CVT_Q_D(double lhs) { union { double d; QData q; } u; u.
 /// Return double from QData (numeric)
 static inline double VL_ITOR_D_I(IData lhs) { return ((double)((vlsint32_t)(lhs))); }
 /// Return QData from double (numeric)
-static inline IData  VL_RTOI_I_D(double lhs) { return ((vlsint32_t)(trunc(lhs))); }
+static inline IData  VL_RTOI_I_D(double lhs) { return ((vlsint32_t)(VL_TRUNC(lhs))); }
 /// Return QData from double (numeric)
-static inline IData  VL_RTOIROUND_I_D(double lhs) { return ((vlsint32_t)(round(lhs))); }
+static inline IData  VL_RTOIROUND_I_D(double lhs) { return ((vlsint32_t)(VL_ROUND(lhs))); }
 
 // Sign extend such that if MSB set, we get ffff_ffff, else 0s
 // (Requires clean input)

include/verilated.mk.in

@@ -13,6 +13,12 @@ LINK = @CXX@
 AR     = ar
 RANLIB = ranlib
 
+CFG_WITH_CCWARN = @CFG_WITH_CCWARN@
+CFG_WITH_LONGTESTS = @CFG_WITH_LONGTESTS@
+
+# Compiler flags to use to turn off unused and generated code warnings, such as -Wno-div-by-zero
+CFG_CXXFLAGS_NO_UNUSED = @CFG_CXXFLAGS_NO_UNUSED@
+
 ######################################################################
 # Programs
 
@@ -38,13 +44,9 @@ VK_CPPFLAGS_ALWAYS += \
 		-DVM_TRACE=$(VM_TRACE) \
 		-DVM_COVERAGE=$(VM_COVERAGE) \
 
-ifeq ($(VERILATOR_AUTHOR_SITE),1)	# Local... Else don't burden users
+ifeq ($(CFG_WITH_CCWARN),yes)	# Local... Else don't burden users
 VK_CPPFLAGS_WALL += -Wall \
-		-Wno-char-subscripts \
-		-Wno-sign-compare \
-		-Wno-unused-parameter \
-		-Wno-unused-variable \
-		-Wno-uninitialized \
+		$(CFG_CXXFLAGS_NO_UNUSED) \
 		-Werror
 endif
 

include/verilatedos.h

@@ -221,6 +221,18 @@ typedef unsigned long long	vluint64_t;	///< 64-bit unsigned type
 #define VL_BITBIT_I(bit)	((bit)&VL_SIZEBITS_I)	///< Bit number for a bit in a long
 #define VL_BITBIT_Q(bit)	((bit)&VL_SIZEBITS_Q)	///< Bit number for a bit in a quad
 
+//=========================================================================
+// Floating point
+// #defines, to avoid requiring math.h on all compile runs
+
+#ifdef _MSC_VER
+# define VL_TRUNC(n) (((n)<0) ? ceil((n))     : floor((n)))
+# define VL_ROUND(n) (((n)<0) ? ceil((n)-0.5) : floor((n)+0.5))
+#else
+# define VL_TRUNC(n) trunc(n)
+# define VL_ROUND(n) round(n)
+#endif
+
 //=========================================================================
 
 #endif /*guard*/

internals.pod

@@ -207,10 +207,10 @@ viewers let us know; ZGRViewer isn't great for large graphs.
 Tree files are dumps of the AST Tree and are produced between every major
 algorithmic stage.  An example:
 
-     NETLIST 0x90fb00 <e1> {0} w0
-    1: MODULE 0x912b20 <e8822> {8} w0  top  L2 [P]
-   *1:2: VAR 0x91a780 <e74#> {22} w70  out_wide [O] WIRE
-    1:2:1: BASICDTYPE 0x91a3c0 <e73> {22} w70  [logic]
+     NETLIST 0x90fb00 <e1> {a0} w0
+    1: MODULE 0x912b20 <e8822> {a8} w0  top  L2 [P]
+   *1:2: VAR 0x91a780 <e74#> {a22} w70  out_wide [O] WIRE
+    1:2:1: BASICDTYPE 0x91a3c0 <e73> {a22} w70  [logic]
 
 =over 4
 
@@ -224,7 +224,8 @@ algorithmic stage.  An example:
 this node.  A trailing # indicates this node changed since the last tree
 dump was made.  You can gdb break on this edit; see below.
 
-"{22}" indicates this node is related to line 22 in the source.
+"{a22}" indicates this node is related to line 22 in the source filename
+"a", where "a" is the first file read, "z" the 36th, and "aa" the 37th.
 
 "w70" indicates the width is 70 bits.  sw70 would be signed 70 bits.
 

nodist/dot_importer

@@ -38,7 +38,7 @@ cwrite ("graph_export.cpp");
 #----------------------------------------------------------------------
 
 sub usage {
-    pod2usage(-verbose=>2, -exitval => 2);
+    pod2usage(-verbose=>2, -exitval=>2, -output=>\*STDOUT);
     exit (1);
 }
 

nodist/dot_pruner

@@ -43,7 +43,7 @@ dotwrite();
 #----------------------------------------------------------------------
 
 sub usage {
-    pod2usage(-verbose=>2, -exitval => 2);
+    pod2usage(-verbose=>2, -exitval=>2, -output=>\*STDOUT);
     exit (1);
 }
 

nodist/install_test

@@ -12,12 +12,15 @@ use vars qw ($Debug);
 #======================================================================
 # main
 
+our $Opt_Stage = 0;
+
 autoflush STDOUT 1;
 autoflush STDERR 1;
 Getopt::Long::config ("no_auto_abbrev");
 if (! GetOptions (
 	  "debug"	=> sub { $Debug = 1; },
 	  "<>"		=> sub { die "%Error: Unknown parameter: $_[0]\n"; },
+	  "stage=i"	=> \$Opt_Stage,
     )) {
     die "%Error: Bad usage, try 'install_test --help'\n";
 }
@@ -37,8 +40,10 @@ sub test {
     my $srcdir = getcwd();
     my $blddir  = $srcdir."/test_regress/obj_dir/install_test_bld";
     my $prefix  = $srcdir."/test_regress/obj_dir/install_test_prefix";
-    my $testdir = $srcdir."/test_regress/obj_dir/install_test_test";
-    if (1) {
+    my $testdirp= $srcdir."/test_regress/obj_dir/install_test_testp";
+    my $testdirn= $srcdir."/test_regress/obj_dir/install_test_testn";
+
+    if ($Opt_Stage <= 0) {
 	run("/bin/rm -rf $blddir");
 	run("/bin/mkdir -p $blddir");
 	run("cd $blddir && $srcdir/configure --prefix $prefix");
@@ -46,24 +51,63 @@ sub test {
     }
 
     # Install it under the prefix
-    if (1) {
+    if ($Opt_Stage <= 1) {
 	run("/bin/rm -rf $prefix");
 	run("/bin/mkdir -p $prefix");
 	run("cd $blddir && make install");
+	run("test -e $prefix/share/man/man1/verilator.1");
+	run("test -e $prefix/share/verilator/examples/test_c/Makefile");
+	run("test -e $prefix/share/verilator/include/verilated.h");
+	run("test -e $prefix/bin/verilator");
+	run("test -e $prefix/bin/verilator_bin");
+	run("test -e $prefix/bin/verilator_bin_dbg");
+	run("test -e $prefix/bin/verilator_profcfunc");
     }
 
     # Run a test using just the path
-    if (1) {
-	run("/bin/rm -rf   $testdir");
-	run("/bin/mkdir -p $testdir");
+    if ($Opt_Stage <= 2) {
+	my $dir = $testdirp;
+	run("/bin/rm -rf   $dir");
+	run("/bin/mkdir -p $dir");
 	my $bin1 = $prefix."/bin";
 	my $bin2 = $prefix."/share/bin";
-	IO::File->new(">$testdir/foo.v")->print('module t; initial begin $display("HELLO WORLD"); end endmodule'."\n");
-	run("cd $testdir && PATH=$bin1:$bin2:\$PATH verilator --cc foo.v");
-	run("cd $testdir/obj_dir && PATH=$bin1:$bin2:\$PATH make -f Vfoo.mk");
-	#Need .c file, and --exe for this to work
-	#run("cd $testdir && PATH=$bin1:$bin2:\$PATH obj_dir/Vfoo");
+	write_verilog($dir);
+	run("cd $dir && PATH=$bin1:$bin2:\$PATH verilator --cc foo.v --exe foo.cpp");
+	run("cd $dir/obj_dir && PATH=$bin1:$bin2:\$PATH make -f Vfoo.mk");
+	run("cd $dir && PATH=$bin1:$bin2:\$PATH obj_dir/Vfoo");
     }
+
+    # Run a test using exact path to binary
+    if ($Opt_Stage <= 3) {
+	my $dir = $testdirn;
+	run("/bin/rm -rf   $dir");
+	run("/bin/mkdir -p $dir");
+	write_verilog($dir);
+	my $bin1 = $prefix."/bin";
+	my $bin2 = $prefix."/share/bin";
+	run("cd $dir && $bin1/verilator --cc foo.v --exe foo.cpp");
+	run("cd $dir/obj_dir && make -f Vfoo.mk");
+	run("cd $dir/obj_dir && ./Vfoo");
+    }
+}
+
+sub write_verilog {
+    my $dir = shift;
+    IO::File->new(">$dir/foo.v")->print('module t; initial begin $display("HELLO WORLD"); $finish; end endmodule'."\n");
+    my $fh = IO::File->new(">$dir/foo.cpp");
+    $fh->print('#include "Vfoo.h"'		,"\n");
+    $fh->print('unsigned int main_time = 0;'	,"\n");
+    $fh->print('double sc_time_stamp () {'	,"\n");
+    $fh->print('    return main_time;'		,"\n");
+    $fh->print('}'				,"\n");
+    $fh->print('int main() {'			,"\n");
+    $fh->print('    Vfoo *top = new Vfoo;'	,"\n");
+    $fh->print('    while (!Verilated::gotFinish()) {',"\n");
+    $fh->print('	top->eval();'		,"\n");
+    $fh->print('	main_time++;'		,"\n");
+    $fh->print('    }'				,"\n");
+    $fh->print('    top->final();'		,"\n");
+    $fh->print('}'				,"\n");
 }
 
 sub cleanenv {

nodist/vtree_importer

@@ -40,7 +40,7 @@ print '(query-replace-regexp "(\\([0-9a-z_]+\\))" "\\1" nil nil nil)',"\n";
 #----------------------------------------------------------------------
 
 sub usage {
-    pod2usage(-verbose=>2, -exitval => 2);
+    pod2usage(-verbose=>2, -exitval=>2, -output=>\*STDOUT);
     exit (1);
 }
 

readme.pod

@@ -91,6 +91,10 @@ headers.
 
 =item
 
+You will need the C<flex> and C<bison> packages installed.
+
+=item
+
 C<cd> to the Verilator directory containing this README.
 
 =item
@@ -147,6 +151,9 @@ most GNU tools support:
     unsetenv VERILATOR_ROOT   # if your shell is csh
     ./configure --prefix /opt/verilator-VERSION
 
+Then after installing you will need to add /opt/verilator-VERSION/bin to
+PATH.
+
 =back
 
 =item

src/Makefile.in

@@ -24,6 +24,7 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 PERL = @PERL@
+EXEEXT = @EXEEXT@
 
 #### End of system configuration section. ####
 
@@ -32,25 +33,11 @@ default: dbg opt
 debug: dbg
 optimize: opt
 
-ifeq ($(OBJCACHE_HOSTS),)
- ifneq ($(SLCHOOSED_HOST),)
-  ifeq ($(VERILATOR_AUTHOR_SITE),1)
-export OBJCACHE_HOSTS := $(shell rschedule --no-allow-reserved --similar hostnames)
-  endif
- endif
-endif
-
-ifeq ($(OBJCACHE_JOBS),)
-ifneq ($(OBJCACHE_HOSTS),)
-export OBJCACHE_JOBS := -j $(shell objcache --jobs "$(OBJCACHE_HOSTS)")
-endif
-endif
-
 ifneq ($(words $(CURDIR)),1)
  $(error Unsupported: GNU Make cannot build in directories containing spaces, build elsewhere: '$(CURDIR)')
 endif
 
-UNDER_GIT = $(wildcard ../.git/logs/HEAD)
+UNDER_GIT = $(wildcard ${srcdir}/../.git/logs/HEAD)
 
 #*********************************************************************
 
@@ -65,26 +52,25 @@ opt: ../verilator_bin
 ifeq ($(VERILATOR_NO_OPT_BUILD),1)	# Faster laptop development... One build
 ../verilator_bin: ../verilator_bin_dbg
 	-rm -rf $@ $@.exe
-	-cp -p $< $@
-	-cp -p $<.exe $@.exe
+	-cp -p $<$(EXEEXT) $@$(EXEEXT)
 else
 ../verilator_bin: obj_opt prefiles
-	cd obj_opt && $(MAKE) -j 1             TGT=../$@ -f ../Makefile_obj serial
-	cd obj_opt && $(MAKE) $(OBJCACHE_JOBS) TGT=../$@ -f ../Makefile_obj
+	cd obj_opt && $(MAKE) -j 1  TGT=../$@ -f ../Makefile_obj serial
+	cd obj_opt && $(MAKE)       TGT=../$@ -f ../Makefile_obj
 endif
 
 dbg: ../verilator_bin_dbg
 ../verilator_bin_dbg: obj_dbg prefiles
-	cd obj_dbg && $(MAKE) -j 1             TGT=../$@ VL_DEBUG=1 -f ../Makefile_obj serial
-	cd obj_dbg && $(MAKE) $(OBJCACHE_JOBS) TGT=../$@ VL_DEBUG=1 -f ../Makefile_obj
+	cd obj_dbg && $(MAKE) -j 1  TGT=../$@ VL_DEBUG=1 -f ../Makefile_obj serial
+	cd obj_dbg && $(MAKE)       TGT=../$@ VL_DEBUG=1 -f ../Makefile_obj
 
 prefiles::
 
 ifneq ($(UNDER_GIT),)	# If local git tree... Else don't burden users
 prefiles:: config_rev.h
-# This output goes into srcdir, as we need to distribute it as part of the kit.
-config_rev.h:	config_rev.pl ../.git/logs/HEAD
-	$(PERL) config_rev.pl . >$@
+# This output goes into srcdir if locally configured, as we need to distribute it as part of the kit.
+config_rev.h:	${srcdir}/config_rev.pl ${srcdir}/../.git/logs/HEAD
+	$(PERL) ${srcdir}/config_rev.pl ${srcdir} >$@
 endif
 
 maintainer-copy::
@@ -96,3 +82,6 @@ clean mostlyclean distclean maintainer-clean::
 
 distclean maintainer-clean::
 	-rm -f Makefile Makefile_obj config_build.h
+
+maintainer-clean::
+	-rm -f config_rev.h

src/Makefile_obj.in

@@ -57,9 +57,11 @@ datarootdir = @datarootdir@
 pkgdatadir = @pkgdatadir@
 
 # Compile options
+CFG_WITH_CCWARN = @CFG_WITH_CCWARN@
 CFG_WITH_DEFENV = @CFG_WITH_DEFENV@
 CPPFLAGS += @CPPFLAGS@
 LDFLAGS += @LDFLAGS@
+EXEEXT = @EXEEXT@
 
 #### End of system configuration section. ####
 
@@ -91,7 +93,7 @@ CPPFLAGS += -DYYDEBUG 	# Required to get nice error messages
 #CPPFLAGS += -DVL_LEAK_CHECKS 	# If running valgrind or other hunting tool
 CPPFLAGS += $(COPT)
 CPPFLAGS += -MP # Only works on recent GCC versions
-ifeq ($(VERILATOR_AUTHOR_SITE),1)	# Local... Else don't burden users
+ifeq ($(CFG_WITH_CCWARN),yes)	# Local... Else don't burden users
 CPPFLAGS += -W -Wall -Wno-unused-parameter -Wno-char-subscripts -Werror
 #CPPFLAGS += -pedantic-errors
 endif
@@ -251,8 +253,6 @@ $(TGT): V3Ast__gen_classes.h $(OBJS)
 	@echo "      Linking $@..."
 	-rm -rf $@ [email protected]
 	${LINK} ${LDFLAGS} -o $@ $(OBJS) $(CCMALLOC) ${LIBS}
-	@-(cp [email protected] $@ || true)
-# ok if cp failes on linux, it's there to insure executable works on NT
 
 V3Number_test: V3Number_test.o
 	${LINK} ${LDFLAGS} -o $@ $^ ${LIBS}

src/V3Ast.h

@@ -27,6 +27,7 @@
 #include "V3Error.h"
 #include "V3Number.h"
 #include <vector>
+#include <cmath>
 
 #include "V3Ast__gen_classes.h"	// From ./astgen
 // Things like:
@@ -825,6 +826,7 @@ public:
     static int	instrCountPli() { return 20; }		///< Instruction cycles to call pli routines
     static int	instrCountDouble() { return 8; }	///< Instruction cycles to convert or do floats
     static int	instrCountDoubleDiv() { return 40; }	///< Instruction cycles to divide floats
+    static int	instrCountDoubleTrig() { return 200; }	///< Instruction cycles to do triganomics
     static int	instrCountCall() { return instrCountBranch()+10; }	///< Instruction cycles to call subroutine
     static int	instrCountTime() { return instrCountCall()+5; }		///< Instruction cycles to determine simulation time
 

src/V3AstNodes.cpp

@@ -501,7 +501,7 @@ void AstNode::dump(ostream& os) {
 	//<<" "<<(void*)this->m_backp
       <<" <e"<<dec<<editCount()
       <<((editCount()>=editCountLast())?"#>":">")
-      <<" {"<<dec<<fileline()->lineno()<<"}"
+      <<" {"<<fileline()->filenameLetters()<<dec<<fileline()->lineno()<<"}"
       <<" "<<(isSigned()?"s":"")
       <<(isDouble()?"d":"")
       <<"w"<<(widthSized()?"":"u")<<width();

src/V3AstNodes.h

@@ -1457,15 +1457,6 @@ struct AstCondBound : public AstNodeCond {
     ASTNODE_NODE_FUNCS(CondBound, CONDBOUND)
 };
 
-struct AstCondD : public AstNodeCond {
-    // Conditional ?: statement, double rhs/lhs/out
-    // Parents:  MATH
-    // Children: MATH
-    AstCondD(FileLine* fl, AstNode* condp, AstNode* expr1p, AstNode* expr2p)
-	: AstNodeCond(fl, condp, expr1p, expr2p) { numeric(AstNumeric::DOUBLE); }
-    ASTNODE_NODE_FUNCS(CondD, CONDD)
-};
-
 struct AstCoverDecl : public AstNodeStmt {
     // Coverage analysis point declaration
     // Parents:  {statement list}
@@ -2832,6 +2823,90 @@ struct AstFGetC : public AstNodeUniop {
     AstNode*	filep() const { return lhsp(); }
 };
 
+struct AstCeilD : public AstNodeUniop {
+    AstCeilD(FileLine* fl, AstNode* lhsp) : AstNodeUniop(fl, lhsp) {
+	numeric(AstNumeric::DOUBLE); }
+    ASTNODE_NODE_FUNCS(CeilD, CEILD)
+    virtual void numberOperate(V3Number& out, const V3Number& lhs) {
+	out.setDouble(ceil(lhs.toDouble())); }
+    virtual string emitVerilog() { return "%f$ceil(%l)"; }
+    virtual string emitC() { return "ceil(%li)"; }
+    virtual bool cleanOut() {return true;} virtual bool cleanLhs() {return false;}
+    virtual bool sizeMattersLhs() {return false;}
+    virtual int instrCount()	const { return instrCountDoubleTrig(); }
+    virtual bool doubleFlavor() const { return true; }
+};
+
+struct AstExpD : public AstNodeUniop {
+    AstExpD(FileLine* fl, AstNode* lhsp) : AstNodeUniop(fl, lhsp) {
+	numeric(AstNumeric::DOUBLE); }
+    ASTNODE_NODE_FUNCS(ExpD, EXPD)
+    virtual void numberOperate(V3Number& out, const V3Number& lhs) {
+	out.setDouble(exp(lhs.toDouble())); }
+    virtual string emitVerilog() { return "%f$exp(%l)"; }
+    virtual string emitC() { return "exp(%li)"; }
+    virtual bool cleanOut() {return true;} virtual bool cleanLhs() {return false;}
+    virtual bool sizeMattersLhs() {return false;}
+    virtual int instrCount()	const { return instrCountDoubleTrig(); }
+    virtual bool doubleFlavor() const { return true; }
+};
+
+struct AstFloorD : public AstNodeUniop {
+    AstFloorD(FileLine* fl, AstNode* lhsp) : AstNodeUniop(fl, lhsp) {
+	numeric(AstNumeric::DOUBLE); }
+    ASTNODE_NODE_FUNCS(FloorD, FLOORD)
+    virtual void numberOperate(V3Number& out, const V3Number& lhs) {
+	out.setDouble(floor(lhs.toDouble())); }
+    virtual string emitVerilog() { return "%f$floor(%l)"; }
+    virtual string emitC() { return "floor(%li)"; }
+    virtual bool cleanOut() {return true;} virtual bool cleanLhs() {return false;}
+    virtual bool sizeMattersLhs() {return false;}
+    virtual int instrCount()	const { return instrCountDoubleTrig(); }
+    virtual bool doubleFlavor() const { return true; }
+};
+
+struct AstLogD : public AstNodeUniop {
+    AstLogD(FileLine* fl, AstNode* lhsp) : AstNodeUniop(fl, lhsp) {
+	numeric(AstNumeric::DOUBLE); }
+    ASTNODE_NODE_FUNCS(LogD, LOGD)
+    virtual void numberOperate(V3Number& out, const V3Number& lhs) {
+	out.setDouble(log(lhs.toDouble())); }
+    virtual string emitVerilog() { return "%f$ln(%l)"; }
+    virtual string emitC() { return "log(%li)"; }
+    virtual bool cleanOut() {return true;} virtual bool cleanLhs() {return false;}
+    virtual bool sizeMattersLhs() {return false;}
+    virtual int instrCount()	const { return instrCountDoubleTrig(); }
+    virtual bool doubleFlavor() const { return true; }
+};
+
+struct AstLog10D : public AstNodeUniop {
+    AstLog10D(FileLine* fl, AstNode* lhsp) : AstNodeUniop(fl, lhsp) {
+	numeric(AstNumeric::DOUBLE); }
+    ASTNODE_NODE_FUNCS(Log10D, LOG10D)
+    virtual void numberOperate(V3Number& out, const V3Number& lhs) {
+	out.setDouble(log10(lhs.toDouble())); }
+    virtual string emitVerilog() { return "%f$log10(%l)"; }
+    virtual string emitC() { return "log10(%li)"; }
+    virtual bool cleanOut() {return true;} virtual bool cleanLhs() {return false;}
+    virtual bool sizeMattersLhs() {return false;}
+    virtual int instrCount()	const { return instrCountDoubleTrig(); }
+    virtual bool doubleFlavor() const { return true; }
+};
+
+struct AstSqrtD : public AstNodeUniop {
+    AstSqrtD(FileLine* fl, AstNode* lhsp) : AstNodeUniop(fl, lhsp) {
+	numeric(AstNumeric::DOUBLE); }
+    ASTNODE_NODE_FUNCS(SqrtD, SQRTD)
+    virtual void numberOperate(V3Number& out, const V3Number& lhs) {
+	out.setDouble(sqrt(lhs.toDouble())); }
+    virtual string emitVerilog() { return "%f$sqrt(%l)"; }
+    virtual string emitC() { return "sqrt(%li)"; }
+    virtual bool cleanOut() {return true;} virtual bool cleanLhs() {return false;}
+    virtual bool sizeMattersLhs() {return false;}
+    virtual int instrCount()	const { return instrCountDoubleTrig(); }
+    virtual bool doubleFlavor() const { return true; }
+};
+
 //======================================================================
 // Binary ops
 
@@ -3904,25 +3979,6 @@ struct AstCReturn : public AstNodeStmt {
     AstNode*	lhsp() const { return op1p(); }
 };
 
-struct AstCInclude : public AstNode {
-    // C++ use of another class
-    // Parents:  MODULE
-    // Children: None
-private:
-    AstNodeModule*	m_modp;
-public:
-    AstCInclude(FileLine* fl, AstNodeModule* modp)
-	: AstNode(fl) {
-	m_modp = modp;
-    }
-    ASTNODE_NODE_FUNCS(CInclude, CINCLUDE)
-    virtual bool broken() const { return (m_modp && !m_modp->brokeExists()); }
-    virtual void cloneRelink() { if (m_modp && m_modp->clonep()) {
-	m_modp = m_modp->clonep()->castNodeModule();
-    }}
-    AstNodeModule*	modp() const { return m_modp; }
-};
-
 struct AstCMath : public AstNodeMath {
 private:
     bool	m_cleanOut;

src/V3EmitC.cpp

@@ -546,7 +546,7 @@ public:
 	    }
 	    ofp()->printf(",0x%08" VL_PRI64 "x)", (vluint64_t)(nodep->num().dataWord(0)));
 	} else if (nodep->isDouble()) {
-	    ofp()->printf("%g", nodep->num().toDouble());
+	    ofp()->printf("%.17g", nodep->num().toDouble());
 	} else if (nodep->isQuad()) {
 	    vluint64_t num = nodep->toUQuad();
 	    if (num<10) ofp()->printf("VL_ULL(%" VL_PRI64 "d)", num);

src/V3Error.cpp

@@ -34,6 +34,9 @@
 //======================================================================
 // Statics
 
+map<string,int> FileLine::s_namemap;
+deque<string> FileLine::s_names;
+// s_defaultFileLine must be after s_name* initializer and in same .cpp file
 FileLine FileLine::s_defaultFileLine = FileLine(EmptySecret());
 
 int V3Error::s_errCount = 0;
@@ -70,8 +73,9 @@ V3ErrorCode::V3ErrorCode(const char* msgp) {
 // FileLine class functions
 
 FileLine::FileLine(FileLine::EmptySecret) {
+    // Sort of a singleton
     m_lineno=0;
-    m_filename="COMMAND_LINE";
+    m_filenameno=nameToNumber("AstRoot");
 
     m_warnOn=0;
     for (int codei=V3ErrorCode::EC_MIN; codei<V3ErrorCode::_ENUM_MAX; codei++) {
@@ -80,6 +84,31 @@ FileLine::FileLine(FileLine::EmptySecret) {
     }
 }
 
+int FileLine::nameToNumber(const string& filename) {
+    // Convert filenames to a filenameno
+    // This lets us assign a nice small identifier for debug messages, but more
+    // importantly lets us use a 4 byte int instead of 8 byte pointer in every FileLine.
+    map<string,int>::const_iterator iter = s_namemap.find(filename);
+    if (VL_LIKELY(iter != s_namemap.end())) return iter->second;
+    int num = s_names.size();
+    s_names.push_back(filename);
+    s_namemap.insert(make_pair(filename,num));
+    return num;
+}
+
+const string FileLine::filenameLetters() const {
+    const int size = 1 + (64 / 4);  // Each letter retires more than 4 bits of a > 64 bit number
+    char out[size];
+    char* op = out+size-1;
+    *--op = '\0';  // We build backwards
+    int num = m_filenameno;
+    do {
+	*--op = 'a'+num%26;
+	num /= 26;
+    } while (num);
+    return op;
+}
+
 string FileLine::lineDirectiveStrg(int enterExit) const {
     char numbuf[20]; sprintf(numbuf, "%d", lineno());
     char levelbuf[20]; sprintf(levelbuf, "%d", enterExit);
@@ -262,6 +291,8 @@ void FileLine::deleteAllRemaining() {
 	// Eventually the list will be empty and terminate the loop.
     }
     fileLineLeakChecks.clear();
+    s_names.clear();
+    s_namemap.clear();
 #endif
 }
 

src/V3Error.h

@@ -28,6 +28,8 @@
 #include <iostream>
 #include <sstream>
 #include <bitset>
+#include <map>
+#include <deque>
 
 //######################################################################
 
@@ -53,6 +55,7 @@ public:
 	// Warning codes:
 	EC_FIRST_WARN,	// Just a code so the program knows where to start warnings
 	//
+	ASSIGNDLY,	// Assignment delays
 	BLKANDNBLK,	// Blocked and non-blocking assignments to same variable
 	BLKSEQ,		// Blocking assignments in sequential block
 	CASEINCOMPLETE,	// Case statement has missing values
@@ -105,6 +108,7 @@ public:
 	    "MULTITOP", "TASKNSVAR", "BLKLOOPINIT",
 	    // Warnings
 	    " EC_FIRST_WARN",
+	    "ASSIGNDLY",
 	    "BLKANDNBLK", "BLKSEQ",
 	    "CASEINCOMPLETE", "CASEOVERLAP", "CASEWITHX", "CASEX", "CDCRSTLOGIC", "CMPCONST",
 	    "COMBDLY", "DEFPARAM", "DECLFILENAME",
@@ -140,7 +144,8 @@ public:
 				      || m_e==UNSIGNED
 				      || m_e==WIDTH); }
     // Warnings that are style only
-    bool styleError() const { return ( m_e==BLKSEQ
+    bool styleError() const { return ( m_e==ASSIGNDLY  // More than style, but for backward compatibility
+				       || m_e==BLKSEQ
 				       || m_e==DEFPARAM
 				       || m_e==DECLFILENAME
 				       || m_e==INCABSPATH
@@ -244,14 +249,29 @@ inline uint32_t cvtToHash(void* vp) {
 
 //######################################################################
 
+class FileLine;
+
+class FileLineSingleton {
+protected:
+    friend class FileLine;
+};
+
 class FileLine {
     // File and line number of an object, mostly for error reporting
     int		m_lineno;
-    string	m_filename;
+    int		m_filenameno;
     bitset<V3ErrorCode::_ENUM_MAX>	m_warnOn;
     // Consider moving opt.language() into here, so can know language per-node
-    static FileLine s_defaultFileLine;
+
+    static map<string,int>	s_namemap;	// filenameno for each filename
+    static deque<string>	s_names;	// filename text for each filenameno
+    static FileLine 		s_defaultFileLine;
+
+    static int nameToNumber(const string& filename);
+    static string numberToName(int filenameno) { return s_names[filenameno]; }
+
     struct EmptySecret {};
+
 protected:
     // User routines should never need to change line numbers
     // We are storing pointers, so we CAN'T change them after initial reading.
@@ -259,14 +279,17 @@ protected:
     friend class V3PreLex;
     friend class V3PreProcImp;
     void lineno(int num) { m_lineno = num; }
-    void filename(const string& name) { m_filename = name; }
+    void filename(const string& name) { m_filenameno = nameToNumber(name); }
     void lineDirective(const char* textp, int& enterExitRef);
     void linenoInc() { m_lineno++; }
     void linenoIncInPlace() { m_lineno++; }
     FileLine* copyOrSameFileLine();
 public:
-    FileLine (const string& filename, int lineno) { m_lineno=lineno; m_filename = filename; m_warnOn=s_defaultFileLine.m_warnOn; }
-    FileLine (FileLine* fromp) { m_lineno=fromp->lineno(); m_filename = fromp->filename(); m_warnOn=fromp->m_warnOn; }
+    FileLine (const string& filename, int lineno) {
+	m_lineno=lineno; m_filenameno = nameToNumber(filename);
+	m_warnOn=s_defaultFileLine.m_warnOn; }
+    FileLine (FileLine* fromp) {
+	m_lineno=fromp->m_lineno; m_filenameno = fromp->m_filenameno; m_warnOn=fromp->m_warnOn; }
     FileLine (EmptySecret);
     ~FileLine() { }
     FileLine* create(const string& filename, int lineno) { return new FileLine(filename,lineno); }
@@ -279,7 +302,8 @@ public:
 
     int lineno () const { return m_lineno; }
     string ascii() const;
-    const string filename () const { return m_filename; }
+    const string filename () const { return numberToName(m_filenameno); }
+    const string filenameLetters() const; 
     const string filebasename () const;
     const string filebasenameNoExt () const;
     const string profileFuncname() const;
@@ -300,10 +324,14 @@ public:
     void tracingOn(bool flag) { warnOn(V3ErrorCode::I_TRACING,flag); }
 
     // METHODS - Global
-    static void globalWarnLintOff(bool flag) { s_defaultFileLine.warnLintOff(flag); }
-    static void globalWarnStyleOff(bool flag) { s_defaultFileLine.warnStyleOff(flag); }
-    static void globalWarnOff(V3ErrorCode code, bool flag) { s_defaultFileLine.warnOff(code, flag); }
-    static bool globalWarnOff(const string& code, bool flag) { return s_defaultFileLine.warnOff(code, flag); }
+    static void globalWarnLintOff(bool flag) {
+	s_defaultFileLine.warnLintOff(flag); }
+    static void globalWarnStyleOff(bool flag) {
+	s_defaultFileLine.warnStyleOff(flag); }
+    static void globalWarnOff(V3ErrorCode code, bool flag) {
+	s_defaultFileLine.warnOff(code, flag); }
+    static bool globalWarnOff(const string& code, bool flag) {
+	return s_defaultFileLine.warnOff(code, flag); }
 
     // METHODS - Called from netlist
     // Merge warning disables from another fileline
@@ -316,7 +344,7 @@ public:
     // OPERATORS
     void v3errorEnd(ostringstream& str);
     inline bool operator==(FileLine rhs) const {
-	return (m_lineno==rhs.m_lineno && m_filename==rhs.m_filename && m_warnOn==rhs.m_warnOn);
+	return (m_lineno==rhs.m_lineno && m_filenameno==rhs.m_filenameno && m_warnOn==rhs.m_warnOn);
     }
 };
 ostream& operator<<(ostream& os, FileLine* fileline);

src/V3Number.cpp

@@ -25,6 +25,7 @@
 #include <cstdio>
 #include <cstdarg>
 #include <algorithm>
+#include <iomanip>
 #include "V3Number.h"
 
 #define MAX_SPRINTF_DOUBLE_SIZE 100  // Maximum characters with a sprintf %e/%f/%g (probably < 30)
@@ -337,6 +338,7 @@ string V3Number::ascii(bool prefixed, bool cleanVerilog) const {
     ostringstream out;
 
     if (isDouble()) {
+	out.precision(17);
 	out<<toDouble();
 	return out.str();
     }
@@ -1475,12 +1477,12 @@ V3Number& V3Number::opIToRD (const V3Number& lhs) {
     return setDouble(lhs.toSInt());
 }
 V3Number& V3Number::opRToIS (const V3Number& lhs) {
-    double v = trunc(lhs.toDouble());
+    double v = VL_TRUNC(lhs.toDouble());
     vlsint32_t i = (vlsint32_t)v; // C converts from double to vlsint32
     return setLongS(i);
 }
 V3Number& V3Number::opRToIRoundS (const V3Number& lhs) {
-    double v = round(lhs.toDouble());
+    double v = VL_ROUND(lhs.toDouble());
     vlsint32_t i = (vlsint32_t)v; // C converts from double to vlsint32
     return setLongS(i);
 }

src/V3Task.cpp

@@ -408,6 +408,7 @@ private:
 		    AstAssign* assp = new AstAssign (pinp->fileline(),
 						     pinp,
 						     new AstVarRef(outvscp->fileline(), outvscp, false));
+		    assp->fileline()->modifyWarnOff(V3ErrorCode::BLKSEQ, true);  // Ok if in <= block
 		    // Put assignment BEHIND of all other statements
 		    beginp->addNext(assp);
 		}
@@ -418,6 +419,7 @@ private:
 		    AstAssign* assp = new AstAssign (pinp->fileline(),
 						     new AstVarRef(inVscp->fileline(), inVscp, true),
 						     pinp);
+		    assp->fileline()->modifyWarnOff(V3ErrorCode::BLKSEQ, true);  // Ok if in <= block
 		    // Put assignment in FRONT of all other statements
 		    if (AstNode* afterp = beginp->nextp()) {
 			afterp->unlinkFrBackWithNext();
@@ -507,6 +509,7 @@ private:
 		    AstAssign* assp = new AstAssign (pinp->fileline(),
 						     pinp,
 						     new AstVarRef(outvscp->fileline(), outvscp, false));
+		    assp->fileline()->modifyWarnOff(V3ErrorCode::BLKSEQ, true);  // Ok if in <= block
 		    // Put assignment BEHIND of all other statements
 		    beginp->addNext(assp);
 		}
@@ -618,6 +621,11 @@ private:
 	    stmt += "VL_CVT_VP_Q(";
 	    ket += ")";
 	}
+	else if (portp->basicp() && portp->basicp()->isBitLogic() && portp->widthMin() != 1 && portp->isQuad()) {
+	    // SV is vector, Verilator isn't
+	    stmt += "VL_SET_QW(";
+	    ket += ")";
+	}
 	if (!cvt
 	    && portp->basicp() && portp->basicp()->isBitLogic() && portp->widthMin() != 1 && !portp->isWide())
 	    stmt += "*";  // it's a svBitVecVal, which other code won't think is arrayed (as WData aren't), but really is

src/V3Undriven.cpp

@@ -217,6 +217,7 @@ private:
     // STATE
     vector<UndrivenVarEntry*>	m_entryps;	// Nodes to delete when we are finished
     bool		m_markBoth;	// Mark as driven+used
+    AstNodeFTask*	m_taskp;	// Current task
 
     // METHODS
     static int debug() {
@@ -241,12 +242,14 @@ private:
     virtual void visit(AstVar* nodep, AstNUser*) {
 	UndrivenVarEntry* entryp = getEntryp (nodep);
 	if (nodep->isInput()
-	    || nodep->isSigPublic() || nodep->isSigUserRWPublic()) {
+	    || nodep->isSigPublic() || nodep->isSigUserRWPublic()
+	    || (m_taskp && (m_taskp->dpiImport() || m_taskp->dpiExport()))) {
 	    entryp->drivenWhole();
 	}
 	if (nodep->isOutput()
 	    || nodep->isSigPublic() || nodep->isSigUserRWPublic()
-	    || nodep->isSigUserRdPublic()) {
+	    || nodep->isSigUserRdPublic()
+	    || (m_taskp && (m_taskp->dpiImport() || m_taskp->dpiExport()))) {
 	    entryp->usedWhole();
 	}
 	// Discover variables used in bit definitions, etc
@@ -284,6 +287,13 @@ private:
 	m_markBoth = prevMark;
     }
 
+    virtual void visit(AstNodeFTask* nodep, AstNUser*) {
+	AstNodeFTask* prevTaskp = m_taskp;
+	m_taskp = nodep;
+	nodep->iterateChildren(*this);
+	m_taskp = prevTaskp;
+    }
+
     // Until we support tables, primitives will have undriven and unused I/Os
     virtual void visit(AstPrimitive* nodep, AstNUser*) {}
 
@@ -303,6 +313,7 @@ public:
     // CONSTUCTORS
     UndrivenVisitor(AstNetlist* nodep) {
 	m_markBoth = false;
+	m_taskp = NULL;
 	nodep->accept(*this);
     }
     virtual ~UndrivenVisitor() {

src/V3Width.cpp

@@ -208,6 +208,13 @@ private:
     virtual void visit(AstPowD* nodep, AstNUser* vup) {		visit_math_Or_LRr(nodep,vup); }
     // Signed/Real: Output real or signed iff LHS signed/real
     virtual void visit(AstNegateD* nodep, AstNUser* vup) {	visit_math_Or_Lr(nodep,vup); }
+    // Real: Output real
+    virtual void visit(AstCeilD* nodep, AstNUser* vup) {	visit_math_Or_Lr(nodep,vup); }
+    virtual void visit(AstExpD* nodep, AstNUser* vup) {		visit_math_Or_Lr(nodep,vup); }
+    virtual void visit(AstFloorD* nodep, AstNUser* vup) {	visit_math_Or_Lr(nodep,vup); }
+    virtual void visit(AstLogD* nodep, AstNUser* vup) {		visit_math_Or_Lr(nodep,vup); }
+    virtual void visit(AstLog10D* nodep, AstNUser* vup) {	visit_math_Or_Lr(nodep,vup); }
+    virtual void visit(AstSqrtD* nodep, AstNUser* vup) {	visit_math_Or_Lr(nodep,vup); }
  
     // Widths: out signed/unsigned width = lhs width, input un|signed 
     virtual void visit(AstSigned* nodep, AstNUser* vup) {	visit_Ous_Lus_Wforce(nodep,vup,AstNumeric::SIGNED); }
@@ -1188,14 +1195,14 @@ private:
 	nodep->taskp()->iterate(*this);
 	//
 	// And do the arguments to the task/function too
-	for (int accept_mode=1; accept_mode>=0; accept_mode--) {  // Avoid duplicate code; just do inner stuff twice
+	for (int accept_mode=0; accept_mode<3; accept_mode++) {  // Avoid duplicate code; just do inner stuff several times
+	  reloop:
 	    V3TaskConnects tconnects = V3Task::taskConnects(nodep, nodep->taskp()->stmtsp());
-	    bool lastloop = false;
-	    for (V3TaskConnects::iterator it=tconnects.begin(); !lastloop && it!=tconnects.end(); ++it) {
+	    for (V3TaskConnects::iterator it=tconnects.begin(); it!=tconnects.end(); ++it) {
 		AstVar* portp = it->first;
 		AstNode* pinp = it->second;
 		if (pinp!=NULL) {  // Else argument error we'll find later
-		    if (accept_mode) {
+		    if (accept_mode==0) {
 			// Prelim may cause the node to get replaced; we've lost our
 			// pointer, so need to iterate separately later
 			if (portp->attrSFormat()
@@ -1214,7 +1221,7 @@ private:
 			    }
 			    handle.relink(newp);
 			    // Connection list is now incorrect (has extra args in it).
-			    lastloop = true;  // so exit early; next loop will correct it
+			    goto reloop;  // so exit early; next loop will correct it
 			}
 			else if (portp->basicp() && portp->basicp()->keyword()==AstBasicDTypeKwd::STRING
 				 && !pinp->castCvtPackString()
@@ -1228,7 +1235,12 @@ private:
 			    pinp = newp;
 			}
 			pinp->accept(*this,WidthVP(portp->width(),portp->widthMin(),PRELIM).p());  pinp=NULL;
-		    } else {
+		    } else if (accept_mode==1) {
+			// Change data types based on above accept completion
+			if (portp->isDouble()) {
+			    spliceCvtD(pinp); pinp=NULL;
+			}
+		    } else if (accept_mode==2) {
 			// Do PRELIM again, because above accept may have exited early due to node replacement
 			pinp->accept(*this,WidthVP(portp->width(),portp->widthMin(),BOTH).p());
 			if ((portp->isOutput() || portp->isInout())
@@ -1585,20 +1597,18 @@ private:
     }
     void visit_math_Or_LRr(AstNodeBiop* nodep, AstNUser* vup) {
 	if (vup->c()->prelim()) {  // First stage evaluation
+	    nodep->lhsp()->iterateAndNext(*this,WidthVP(ANYSIZE,0,BOTH).p());
+	    nodep->rhsp()->iterateAndNext(*this,WidthVP(ANYSIZE,0,BOTH).p());
 	    checkCvtD(nodep->lhsp());
 	    checkCvtD(nodep->rhsp());
 	    nodep->numeric(AstNumeric::DOUBLE);
-	    // Determine expression widths only relying on what's in the subops
-	    nodep->lhsp()->iterateAndNext(*this,WidthVP(ANYSIZE,0,BOTH).p());
-	    nodep->rhsp()->iterateAndNext(*this,WidthVP(ANYSIZE,0,BOTH).p());
 	}
     }
     void visit_math_Or_Lr(AstNodeUniop* nodep, AstNUser* vup) {
 	if (vup->c()->prelim()) {  // First stage evaluation
+	    nodep->lhsp()->iterateAndNext(*this,WidthVP(ANYSIZE,0,BOTH).p());
 	    checkCvtD(nodep->lhsp());
 	    nodep->numeric(AstNumeric::DOUBLE);
-	    // Determine expression widths only relying on what's in the subops
-	    nodep->lhsp()->iterateAndNext(*this,WidthVP(ANYSIZE,0,BOTH).p());
 	}
     }
 

src/Verilator.cpp

@@ -106,7 +106,7 @@ void V3Global::readFiles() {
     for (V3StringList::const_iterator it = v3Global.opt.vFiles().begin();
 	 it != v3Global.opt.vFiles().end(); ++it) {
 	string filename = *it;
-	parser.parseFile(new FileLine("CommandLine",0), filename, false);
+	parser.parseFile(new FileLine("COMMAND_LINE",0), filename, false);
     }
 
     // Read libraries
@@ -115,7 +115,7 @@ void V3Global::readFiles() {
     for (V3StringSet::const_iterator it = v3Global.opt.libraryFiles().begin();
 	 it != v3Global.opt.libraryFiles().end(); ++it) {
 	string filename = *it;
-	parser.parseFile(new FileLine("CommandLine",0), filename, true);
+	parser.parseFile(new FileLine("COMMAND_LINE",0), filename, true);
     }
     //v3Global.rootp()->dumpTreeFile(v3Global.debugFilename("parse.tree"));
     V3Error::abortIfErrors();

src/astgen

@@ -7,28 +7,36 @@ use Getopt::Long;
 use IO::File;
 use Pod::Usage;
 use strict;
-use vars qw ($Debug @Types %Classes);
+use vars qw ($Debug @Types %Classes %ClassRefs %Stages);
 
 #======================================================================
 # main
 
 $Debug = 0;
 my $opt_classes;
+my $opt_report;
 my @Opt_Cpt;
 my @Opt_I;
 Getopt::Long::config ("pass_through", "no_auto_abbrev");
 if (! GetOptions (
-		  "help"	=> \&usage,
-		  "debug"	=> \&debug,
-		  "classes!"	=> \$opt_classes,
-		  "<>"		=> \&parameter,
-		  )) {
+	  "help"	=> \&report,
+	  "debug"	=> \&debug,
+	  "classes!"	=> \$opt_classes,
+	  "report!"	=> \$opt_report,
+	  "<>"		=> \&parameter,
+    )) {
     usage();
 }
 
 read_types("$Opt_I[0]/V3Ast.h");
 read_types("$Opt_I[0]/V3AstNodes.h");
+read_stages("$Opt_I[0]/Verilator.cpp");
+read_refs(glob("$Opt_I[0]/*.y"), glob("$Opt_I[0]/*.h"), glob("$Opt_I[0]/*.cpp"));
+if ($opt_report) {
+    write_report(undef);
+}
 if ($opt_classes) {
+    write_report("V3Ast__gen_report.txt");
     write_classes("V3Ast__gen_classes.h");
     write_visitor("V3Ast__gen_visitor.h");
     write_intf("V3Ast__gen_interface.h");
@@ -42,7 +50,7 @@ foreach my $cpt (@Opt_Cpt) {
 #----------------------------------------------------------------------
 
 sub usage {
-    pod2usage(-verbose=>2, -exitval => 2);
+    pod2usage(-verbose=>2, -exitval=>2, -output=>\*STDOUT);
     exit (1);
 }
 
@@ -85,6 +93,44 @@ sub read_types {
     }
 }
 
+sub read_stages {
+    my $filename = shift;
+
+    my $fh = IO::File->new($filename) or die "%Error: $! $filename,";
+    my $n = 0;
+    while (defined (my $line = $fh->getline())) {
+	$line =~ s/\/\/.*$//;
+	next if $line =~ /^\s*$/;
+	if ($line =~ /^\s*([A-Za-z0-9]+)::/) {
+	    my $stage = $1.".cpp";
+	    if (!defined ($Stages{$stage})) {
+		$Stages{$stage} = $n++;
+	    }
+	}
+    }
+}
+
+sub read_refs {
+    my @filenames = @_;
+
+    foreach my $filename (@filenames) {
+	(my $basename = $filename) =~ s!.*/!!;
+	my $fh = IO::File->new($filename) or die "%Error: $! $filename,";
+	while (defined (my $line = $fh->getline())) {
+	    $line =~ s/\/\/.*$//;
+	    while ($line =~ /\bnew\s*(Ast[A-Za-z0-9_]+)/g) {
+		$ClassRefs{$1}{newed}{$basename} = 1;
+	    }
+	    while ($line =~ /\b(Ast[A-Za-z0-9_]+)/g) {
+		$ClassRefs{$1}{used}{$basename} = 1;
+	    }
+	}
+    }
+    #use Data::Dumper;print Dumper(\%ClassRefs);
+}
+
+#----------------------------------------------------------------------
+
 sub open_file {
     my $filename = shift;
     my $fh = IO::File->new($filename,"w") or die "%Error: $! $filename,";
@@ -108,6 +154,42 @@ sub subclasses_of {
 
 #----------------------------------------------------------------------
 
+sub write_report {
+    my $filename = shift;
+    my $fh = defined($filename) ? open_file($filename) : \*STDOUT;
+
+    $fh->print("Processing stages (approximate, based on order in Verilator.cpp):\n");
+    foreach my $class (sort {$Stages{$a} <=> $Stages{$b}} keys %Stages) {
+	$fh->print("\t$class\n");
+    }
+
+    $fh->print("\nProcessing stages (approximate, based on order in Verilator.cpp):\n");
+    foreach my $type (sort (keys %Classes)) {
+	printf $fh "  class %-20s\n", "Ast${type}";
+	$fh->print("\tparent:\t");
+	foreach my $subclass (subclasses_of($type)) {
+	    next if $subclass eq 'Node';
+	    printf $fh "Ast%-12s ",$subclass;
+	}
+	printf $fh "\n";
+	if (my $refs = $ClassRefs{"Ast${type}"}) {
+	    $fh->print("\tnewed:\t");
+	    foreach my $stage (sort {($Stages{$a}||-1) <=> ($Stages{$b}||-1)}
+			       keys %{$refs->{newed}}) {
+		$fh->print($stage."  ");
+	    }
+	    $fh->print("\n");
+	    $fh->print("\tused:\t");
+	    foreach my $stage (sort {($Stages{$a}||-1) <=> ($Stages{$b}||-1)}
+			       keys %{$refs->{used}}) {
+		$fh->print($stage."  ");
+	    }
+	    $fh->print("\n");
+	}
+	$fh->print("\n");
+    }
+}
+
 sub write_classes {
     my $fh = open_file(@_);
     foreach my $type (sort (keys %Classes)) {
@@ -501,7 +583,11 @@ Displays this message and program version and exits.
 
 =item --classes
 
-Makes class declaration files
+Makes class declaration files.
+
+=item --report
+
+Makes a report report.
 
 =back
 
@@ -526,5 +612,5 @@ Wilson Snyder <[email protected]>
 
 ######################################################################
 ### Local Variables:
-### compile-command: "./astgen "
+### compile-command: "./astgen -I. --report"
 ### End:

src/bisonpre

@@ -56,7 +56,7 @@ process();
 
 sub usage {
     print "Version $VERSION\n";
-    pod2usage(-verbose=>2, -exitval => 2);
+    pod2usage(-verbose=>2, -exitval=>2, -output=>\*STDOUT);
     exit (1);
 }
 

src/config_build.h.in

@@ -25,41 +25,17 @@
 //**********************************************************************
 //**** Version and host name
 
-#define DTVERSION	"Verilator 3.821 2011/08/21"
+// Autoconf substitutes this with the strings from AC_INIT.
+#define PACKAGE_STRING ""
+
+#define DTVERSION	PACKAGE_STRING
 
 //**********************************************************************
 //**** Functions
 
-// Set define if we have function: strdup (string)
-#define HAVE_STRDUP 0
-
 //**********************************************************************
 //**** Headers
 
-// Set define if we have header: <fcntl.h>
-#define HAVE_FCNTL_H 0
-
-// Set define if we have header: <math.h>
-#define HAVE_MATH_H 1
-
-// Set define if we have header: <unistd.h>
-#define HAVE_UNISTD_H 0
-
-// Set define if we have header: <sys/time.h>
-#define HAVE_SYS_TIME_H 0
-
-// Set define if we have header: <sys/un.h>
-#define HAVE_SYS_UN_H 0
-
-// Set define if we have header: <stdint.h>
-#define HAVE_STDINT_H 0
-
-// Set define if we have header: <mingw/stdint.h>
-#define HAVE_MINGW_STDINT_H 0
-
-// Set define if we have header: <inttypes.h>
-#define HAVE_INTTYPES_H 0
-
 //**********************************************************************
 //**** Default environment
 

src/verilog.l

@@ -175,7 +175,9 @@ word	[a-zA-Z0-9_]+
   "$c"[0-9]*		{ FL; return yD_C; }		/*Verilator only*/
   /*     System Tasks */
   "$bitstoreal"		{ FL; return yD_BITSTOREAL; }
+  "$ceil"		{ FL; return yD_CEIL; }
   "$display"		{ FL; return yD_DISPLAY; }
+  "$exp"		{ FL; return yD_EXP; }
   "$fclose"		{ FL; return yD_FCLOSE; }
   "$fdisplay"		{ FL; return yD_FDISPLAY; }
   "$feof"		{ FL; return yD_FEOF; }
@@ -183,14 +185,18 @@ word	[a-zA-Z0-9_]+
   "$fgetc"		{ FL; return yD_FGETC; }
   "$fgets"		{ FL; return yD_FGETS; }
   "$finish"		{ FL; return yD_FINISH; }
+  "$floor"		{ FL; return yD_FLOOR; }
   "$fopen"		{ FL; return yD_FOPEN; }
   "$fscanf"		{ FL; return yD_FSCANF; }
   "$fullskew"		{ FL; return yaTIMINGSPEC; }
   "$fwrite"		{ FL; return yD_FWRITE; }
   "$hold"		{ FL; return yaTIMINGSPEC; }
   "$itor"		{ FL; return yD_ITOR; }
+  "$ln"			{ FL; return yD_LN; }
+  "$log10"		{ FL; return yD_LOG10; }
   "$nochange"		{ FL; return yaTIMINGSPEC; }
   "$period"		{ FL; return yaTIMINGSPEC; }
+  "$pow"		{ FL; return yD_POW; }
   "$random"		{ FL; return yD_RANDOM; }
   "$readmemb"		{ FL; return yD_READMEMB; }
   "$readmemh"		{ FL; return yD_READMEMH; }
@@ -204,6 +210,7 @@ word	[a-zA-Z0-9_]+
   "$setuphold"		{ FL; return yaTIMINGSPEC; }
   "$sformat"		{ FL; return yD_SFORMAT; }
   "$skew"		{ FL; return yaTIMINGSPEC; }
+  "$sqrt"		{ FL; return yD_SQRT; }
   "$sscanf"		{ FL; return yD_SSCANF; }
   "$stime"		{ FL; return yD_STIME; }
   "$stop"		{ FL; return yD_STOP; }

src/verilog.y

@@ -386,10 +386,12 @@ class AstSenTree;
 %token<fl>		yD_BITS		"$bits"
 %token<fl>		yD_BITSTOREAL	"$bitstoreal"
 %token<fl>		yD_C		"$c"
+%token<fl>		yD_CEIL		"$ceil"
 %token<fl>		yD_CLOG2	"$clog2"
 %token<fl>		yD_COUNTONES	"$countones"
 %token<fl>		yD_DISPLAY	"$display"
 %token<fl>		yD_ERROR	"$error"
+%token<fl>		yD_EXP		"$exp"
 %token<fl>		yD_FATAL	"$fatal"
 %token<fl>		yD_FCLOSE	"$fclose"
 %token<fl>		yD_FDISPLAY	"$fdisplay"
@@ -398,14 +400,18 @@ class AstSenTree;
 %token<fl>		yD_FGETC	"$fgetc"
 %token<fl>		yD_FGETS	"$fgets"
 %token<fl>		yD_FINISH	"$finish"
+%token<fl>		yD_FLOOR	"$floor"
 %token<fl>		yD_FOPEN	"$fopen"
 %token<fl>		yD_FSCANF	"$fscanf"
 %token<fl>		yD_FWRITE	"$fwrite"
 %token<fl>		yD_INFO		"$info"
 %token<fl>		yD_ISUNKNOWN	"$isunknown"
 %token<fl>		yD_ITOR		"$itor"
+%token<fl>		yD_LN		"$ln"
+%token<fl>		yD_LOG10	"$log10"
 %token<fl>		yD_ONEHOT	"$onehot"
 %token<fl>		yD_ONEHOT0	"$onehot0"
+%token<fl>		yD_POW		"$pow"
 %token<fl>		yD_RANDOM	"$random"
 %token<fl>		yD_READMEMB	"$readmemb"
 %token<fl>		yD_READMEMH	"$readmemh"
@@ -414,6 +420,7 @@ class AstSenTree;
 %token<fl>		yD_RTOI		"$rtoi"
 %token<fl>		yD_SFORMAT	"$sformat"
 %token<fl>		yD_SIGNED	"$signed"
+%token<fl>		yD_SQRT		"$sqrt"
 %token<fl>		yD_SSCANF	"$sscanf"
 %token<fl>		yD_STIME	"$stime"
 %token<fl>		yD_STOP		"$stop"
@@ -1520,7 +1527,7 @@ assignOne<nodep>:
 
 delayE:
 		/* empty */				{ }
-	|	delay_control				{ } /* ignored */
+	|	delay_control				{ $1->v3warn(ASSIGNDLY,"Ignoring delay on this assignment/primitive."); } /* ignored */
 	;
 
 delay_control<fl>:	//== IEEE: delay_control
@@ -2111,7 +2118,7 @@ system_t_call<nodep>:		// IEEE: system_tf_call (as task)
 	|	yD_C '(' cStrList ')'			{ $$ = (v3Global.opt.ignc() ? NULL : new AstUCStmt($1,$3)); }
 	|	yD_FCLOSE '(' idClassSel ')'		{ $$ = new AstFClose($1, $3); }
 	|	yD_FFLUSH parenE			{ $1->v3error("Unsupported: $fflush of all handles does not map to C++."); }
-	|	yD_FFLUSH '(' idClassSel ')'		{ $$ = new AstFClose($1, $3); }
+	|	yD_FFLUSH '(' idClassSel ')'		{ $$ = new AstFFlush($1, $3); }
 	|	yD_FINISH parenE			{ $$ = new AstFinish($1); }
 	|	yD_FINISH '(' expr ')'			{ $$ = new AstFinish($1); }
 	|	yD_STOP parenE				{ $$ = new AstStop($1); }
@@ -2152,6 +2159,13 @@ system_f_call<nodep>:		// IEEE: system_tf_call (as func)
 	|	yaD_DPI parenE				{ $$ = new AstFuncRef($<fl>1,*$1,NULL); }
 	|	yaD_DPI '(' exprList ')'		{ $$ = new AstFuncRef($2,*$1,$3); }
 	//
+	|	yD_CEIL '(' expr ')'			{ $$ = new AstCeilD($1,$3); }
+	|	yD_EXP '(' expr ')'			{ $$ = new AstExpD($1,$3); }
+	|	yD_FLOOR '(' expr ')'			{ $$ = new AstFloorD($1,$3); }
+	|	yD_LN '(' expr ')'			{ $$ = new AstLogD($1,$3); }
+	|	yD_LOG10 '(' expr ')'			{ $$ = new AstLog10D($1,$3); }
+	|	yD_POW '(' expr ',' expr ')'		{ $$ = new AstPowD($1,$3,$5); }
+	|	yD_SQRT '(' expr ')'			{ $$ = new AstSqrtD($1,$3); }
 	|	yD_BITS '(' expr ')'			{ $$ = new AstAttrOf($1,AstAttrType::EXPR_BITS,$3); }
 	|	yD_BITS '(' data_type ')'		{ $$ = new AstAttrOf($1,AstAttrType::EXPR_BITS,$3); }
 	|	yD_BITSTOREAL '(' expr ')'		{ $$ = new AstBitsToRealD($1,$3); }

test_c/Makefile_obj

@@ -19,11 +19,9 @@ include Vtop.mk
 # Compile flags
 
 CPPFLAGS += -DVL_DEBUG=1
-ifeq ($(VERILATOR_AUTHOR_SITE),1)	# Local... Else don't burden users
+ifeq ($(CFG_WITH_CCWARN),yes)	# Local... Else don't burden users
 CPPFLAGS += -DVL_THREADED=1
 CPPFLAGS += -W -Werror -Wall
-#CPPFLAGS += -Wno-unused-variable	# Instead, add VL_ATTR_UNUSED in gen'ed code
-#CPPFLAGS += -pedantic-errors
 endif
 
 #######################################################################

test_regress/Makefile

@@ -35,7 +35,8 @@ endif
 
 PRODUCTS += --vlt
 
-ifeq ($(VERILATOR_AUTHOR_SITE),1)
+# Run tests in parallel.  Requires Parallel::Forker to be installed.
+ifeq ($(CFG_WITH_LONGTESTS),yes)
  DRIVER_FLAGS += -j 0
 endif
 

test_regress/Makefile_obj

@@ -25,13 +25,6 @@ VPATH += ../../$(VM_USER_DIR)
 
 #######################################################################
 
-ifeq ($(VERILATOR_AUTHOR_SITE),1)
-#OBJCACHE := objcache --read --write
-#OBJCACHE_HOSTS :=
-endif
-
-#######################################################################
-
 # Needed by DPI tests
 CPPFLAGS += -DVERILATOR=1
 

test_regress/driver.pl

@@ -39,6 +39,7 @@ autoflush STDERR 1;
 
 our @Orig_ARGV = @ARGV;
 our @Orig_ARGV_Sw;  foreach (@Orig_ARGV) { push @Orig_ARGV_Sw, $_ if /^-/ && !/^-j/; }
+our $Start = time();
 
 $Debug = 0;
 my $opt_atsim;
@@ -64,6 +65,7 @@ Getopt::Long::config ("pass_through");
 if (! GetOptions (
 		  "benchmark:i" => sub { $opt_benchmark = $_[1] ? $_[1] : 1; },
 		  "debug"	=> \&debug,
+	  	  #debugi	   see parameter()
 		  "atsim|athdl!"=> \$opt_atsim,
 		  "gdb!"	=> \$opt_gdb,
 		  "gdbbt!"	=> \$opt_gdbbt,
@@ -83,6 +85,7 @@ if (! GetOptions (
 		  "vcs!"	=> \$opt_vcs,
 		  "verbose!"	=> \$opt_verbose,
 		  "verilated_debug!"	=> \$Opt_Verilated_Debug,
+	  	  #W		   see parameter()
 		  "<>"		=> \&parameter,
 		  )) {
     die "%Error: Bad usage, try '$0 --help'\n";
@@ -178,7 +181,7 @@ exit(10) if $failcnt;
 #----------------------------------------------------------------------
 
 sub usage {
-    pod2usage(-verbose=>2, -exitval => 2);
+    pod2usage(-verbose=>2, -exitval=>2, -output=>\*STDOUT);
     exit (1);
 }
 
@@ -204,6 +207,9 @@ sub parameter {
 	push @Opt_Driver_Verilator_Flags, $param;
 	$_Parameter_Next_Level = $param;
     }
+    elsif ($param =~ /^-?-W/) {
+	push @Opt_Driver_Verilator_Flags, $param;
+    }
     else {
 	die "%Error: Unknown parameter: $param\n";
     }
@@ -228,14 +234,17 @@ sub report {
 	$fh = IO::File->new(">$filename") or die "%Error: $! writing $filename,";
     }
 
+    my $delta = time() - $Start;
     $fh->print("\n");
     $fh->print("="x70,"\n");
-    $fh->print("TESTS Passed $okcnt  Skipped $skcnt  Failed $failcnt\n");
+    $fh->printf("TESTS Passed $okcnt  Skipped $skcnt  Failed $failcnt  Time %d:%02d\n",
+	       int($delta/60),$delta%60);
     foreach my $f (@$fails) {
 	chomp $f;
 	$fh->print("$f\n");
     }
-    $fh->print("TESTS Passed $okcnt  Skipped $skcnt  Failed $failcnt\n");
+    $fh->printf("TESTS Passed $okcnt  Skipped $skcnt  Failed $failcnt  Time %d:%02d\n",
+	       int($delta/60),$delta%60);
 }
 
 #######################################################################

test_regress/t/t_alw_split.pl

@@ -11,7 +11,7 @@ compile (
 	 verilator_flags2 => ["--stats"],
 	 );
 
-if ($Self->{v3}) {
+if ($Self->{vlt}) {
     file_grep ($Self->{stats}, qr/Optimizations, Split always\s+6/i);
 }
 

test_regress/t/t_alw_splitord.pl

@@ -11,7 +11,7 @@ compile (
 	 verilator_flags2 => ["--stats"],
 	 );
 
-if ($Self->{v3}) {
+if ($Self->{vlt}) {
     file_grep ($Self->{stats}, qr/Optimizations, Split always\s+0/i);
 }
 

test_regress/t/t_assert_basic.pl

@@ -8,7 +8,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Version 2.0.
 
 compile (
-	 v_flags2 => [$Self->{v3}?'--assert':($Self->{nc}?'+assert':'')],
+	 verilator_flags2 => ['--assert'],
+	 nc_flags2 => ['+assert'],
 	 );
 
 execute (

test_regress/t/t_assert_basic_cover.pl

@@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 top_filename("t/t_assert_basic.v");
 
 compile (
-	 v_flags2 => [$Self->{v3}?'--assert --sp --coverage-user':''],
+	 verilator_flags2 => ['--assert --sp --coverage-user'],
 	 );
 
 execute (

test_regress/t/t_assert_cover.pl

@@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 top_filename("t/t_assert_cover.v");
 
 compile (
-	 v_flags2 => [$Self->{v3}?'--assert --sp --coverage-user':''],
+	 verilator_flags2 => ['--assert --sp --coverage-user'],
 	 nc_flags2 => ["+nccovoverwrite +nccoverage+all +nccovtest+$Self->{name}"]
 	 );
 

test_regress/t/t_assert_synth.pl

@@ -8,7 +8,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Version 2.0.
 
 compile (
-	 v_flags2 => [$Self->{v3}?'--assert':($Self->{nc}?'+assert':'')],
+	 verilator_flags2 => ['--assert'],
+    	 nc_flags2 => ['+assert'],
 	 );
 
 execute (

test_regress/t/t_assert_synth_full.pl

@@ -10,8 +10,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 top_filename("t/t_assert_synth.v");
 
 compile (
-	 v_flags2 => [$Self->{v3}?'--assert':($Self->{nc}?'+assert':''),
-		      '+define+FAILING_FULL',],
+	 v_flags2 => ['+define+FAILING_FULL'],
+	 verilator_flags2 => ['--assert'],
+	 nc_flags2 => ['+assert'],
 	 );
 
 execute (

test_regress/t/t_assert_synth_parallel.pl

@@ -10,8 +10,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 top_filename("t/t_assert_synth.v");
 
 compile (
-	 v_flags2 => [$Self->{v3}?'--assert':($Self->{nc}?'+assert':''),
-		      '+define+FAILING_PARALLEL',],
+	 v_flags2 => ['+define+FAILING_PARALLEL'],
+	 verilator_flags2 => ['--assert'],
+	 nc_flags2 => ['+assert'],
 	 );
 
 execute (

test_regress/t/t_case_huge.pl

@@ -11,7 +11,7 @@ compile (
 	 verilator_flags2 => ["--stats --profile-cfuncs"],
 	 );
 
-if ($Self->{v3}) {
+if ($Self->{vlt}) {
     file_grep ($Self->{stats}, qr/Optimizations, Tables created\s+10/i);
     file_grep ($Self->{stats}, qr/Optimizations, Combined CFuncs\s+10/i);
 }

test_regress/t/t_clk_2in.pl

@@ -7,14 +7,18 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 make_top_shell => 0,
 	 make_main => 0,
-	 v_flags2 => ["--exe $Self->{t_dir}/$Self->{name}.cpp"],
-	 ) if $Self->{v3};
+	 v_flags2 => ["$Self->{t_dir}/$Self->{name}.cpp"],
+	 verilator_flags2 => ["--exe"],
+	 );
 
 execute (
 	 check_finished=>1,
-	 ) if $Self->{v3};
+	 );
+
 ok(1);
 1;

test_regress/t/t_clk_2in_vec.pl

@@ -9,14 +9,17 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 top_filename("t/t_clk_2in.v");
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 make_top_shell => 0,
 	 make_main => 0,
-	 v_flags2 => ["+define+T_CLK_2IN_VEC=1 --exe $Self->{t_dir}/t_clk_2in.cpp"],
-	 ) if $Self->{v3};
+	 v_flags2 => ["+define+T_CLK_2IN_VEC=1 $Self->{t_dir}/t_clk_2in.cpp"],
+	 verilator_flags2 => ["--exe"],
+	 );
 
 execute (
 	 check_finished=>1,
-	 ) if $Self->{v3};
+	 );
 ok(1);
 1;

test_regress/t/t_clk_gater.pl

@@ -15,7 +15,7 @@ execute (
 	 check_finished=>1,
      );
 
-if ($Self->{v3}) {
+if ($Self->{vlt}) {
     #Optimization is disabled
     #file_grep ($Self->{stats}, qr/Optimizations, Gaters inserted\s+3/i);
 }

test_regress/t/t_debug_fatalsrc_bad.pl

@@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 $Self->{vlt} or $Self->skip("Verilator only test");
 
 compile (
-	 v_flags2 => ["--debug-fatalsrc"],
+	 verilator_flags2 => ["--debug-fatalsrc"],
 	 fails=>$Self->{v3},
 	 expect=>
 '%Error: Internal Error: .*: --debug-fatal-src

test_regress/t/t_debug_sigsegv_bad.pl

@@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 $Self->{vlt} or $Self->skip("Verilator only test");
 
 compile (
-	 v_flags2 => ["--debug-sigsegv"],
+	 verilator_flags2 => ["--debug-sigsegv"],
 	 fails=>$Self->{v3},
 	 expect=>
 '%Error: Verilator internal fault, sorry.  Consider trying --debug --gdbbt

test_regress/t/t_delay.pl

@@ -8,7 +8,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Version 2.0.
 
 compile (
-	 v_flags2 => [$Self->{v3}?'-Wno-STMTDLY':''],
+	 verilator_flags2 => ['-Wno-STMTDLY -Wno-ASSIGNDLY'],
 	 );
 
 execute (

test_regress/t/t_delay.v

@@ -28,6 +28,7 @@ module t (/*AUTOARG*/
       end
       else if (cyc==3) begin
 	 if (dly0 !== 32'h23) $stop;
+	 if (dly2 !== 32'h25) $stop;
 	 $write("*-* All Finished *-*\n");
 	 #100 $finish;
       end

test_regress/t/t_delay_stmtdly_bad.pl

@@ -9,12 +9,19 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 top_filename("t/t_delay.v");
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
+	 verilator_flags2 => ['-Wall -Wno-DECLFILENAME'],
 	 fails=>1,
 	 expect=>
-'%Warning-STMTDLY: t/t_delay.v:\d+: Ignoring delay on this delayed statement.
+'%Warning-ASSIGNDLY: t/t_delay.v:\d+: Ignoring delay on this assignment/primitive.
+%Warning-ASSIGNDLY: Use .*
+%Warning-ASSIGNDLY: t/t_delay.v:\d+: Ignoring delay on this assignment/primitive.
+%Warning-ASSIGNDLY: t/t_delay.v:\d+: Ignoring delay on this assignment/primitive.
+%Warning-STMTDLY: t/t_delay.v:\d+: Ignoring delay on this delayed statement.
 .*%Error: Exiting due to.*',
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_display_noopt.pl

@@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 top_filename("t/t_display.v");
 
 compile (
-	 v_flags2 => [$Self->{v3}?"-O0":""],
+	 verilator_flags2 => ["-O0"],
 	 );
 
 execute (

test_regress/t/t_display_real_noopt.pl

@@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 top_filename("t/t_display_real.v");
 
 compile (
-	 v_flags2 => [$Self->{v3}?"-O0":""],
+	 verilator_flags2 => ["-O0"],
 	 );
 
 execute (

test_regress/t/t_display_signed_noopt.pl

@@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 top_filename("t/t_display_signed.v");
 
 compile (
-	 v_flags2 => [$Self->{v3}?"-O0":""],
+	 verilator_flags2 => ["-O0"],
 	 );
 
 execute (

test_regress/t/t_dpi_export.pl

@@ -12,7 +12,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 compile (
 	 # Amazingly VCS, NC and Verilator all just accept the C file here!
 	 v_flags2 => ["t/t_dpi_export_c.cpp"],
-	 verilator_flags2 => ["-no-l2name"],
+	 verilator_flags2 => ["-Wall -Wno-DECLFILENAME -no-l2name"],
 	 );
 
 execute (

test_regress/t/t_dpi_import.pl

@@ -10,6 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 compile (
 	 # Amazingly VCS, NC and Verilator all just accept the C file here!
 	 v_flags2 => ["t/t_dpi_import_c.cpp"],
+	 verilator_flags2 => ["-Wall -Wno-DECLFILENAME"],
 	 );
 
 execute (

test_regress/t/t_dpi_import.v

@@ -15,7 +15,11 @@
  `define NO_SHORTREAL
 `endif
 
-module t ();
+module t (/*AUTOARG*/
+   // Inputs
+   clk
+   );
+   input clk;
 
    // Allowed import return types:
    //         void, byte, shortint, int, longint, real, shortreal, chandle, and string
@@ -55,6 +59,7 @@ module t ();
 `ifndef NO_SHORTREAL
    import "DPI-C" pure function void dpii_v_shortreal(input shortreal i, output shortreal o);
 `endif
+   import "DPI-C" pure function void dpii_v_bit64    (input bit [64-1:0] i, output bit [64-1:0] o);
    import "DPI-C" pure function void dpii_v_bit95    (input bit [95-1:0] i, output bit [95-1:0] o);
    import "DPI-C" pure function void dpii_v_bit96    (input bit [96-1:0] i, output bit [96-1:0] o);
 
@@ -73,11 +78,11 @@ module t ();
    import "DPI-C" dpii_fa_bit =  function int oth_f_int2(input int i);
 
    bit       	i_b,	o_b;
-   bit [7:0]	i_b8,	o_b8;
-   bit [8:0]	i_b9,	o_b9;
-   bit [15:0]	i_b16,	o_b16;
-   bit [16:0]	i_b17,	o_b17;
-   bit [31:0]	i_b32,	o_b32;
+   bit [7:0]    i_b8;
+   bit [8:0]	i_b9;
+   bit [15:0]	i_b16;
+   bit [16:0]   i_b17;
+   bit [31:0]	i_b32;
    bit [32:0]	i_b33,	o_b33;
    bit [63:0]	i_b64,	o_b64;
    bit [94:0]	i_b95,	o_b95;
@@ -87,19 +92,21 @@ module t ();
    byte		i_y,	o_y;
    shortint	i_s,	o_s;
    longint	i_l,	o_l;
+   // verilator lint_off UNDRIVEN
    chandle	i_c,	o_c;
    string 	i_n,	o_n;
+   // verilator lint_on UNDRIVEN
    real 	i_d,	o_d;
 `ifndef NO_SHORTREAL
    shortreal 	i_f,	o_f;
 `endif
 
-   bit [127:0] wide;
+   bit [94:0] wide;
 
    bit [6*8:1] string6;
 
    initial begin
-      wide = 128'h36f3e51d15caff7a73c48afee4ffcb57;
+      wide = 95'h15caff7a73c48afee4ffcb57;
 
       i_b  = 1'b1;
       i_b8  = {1'b1,wide[8-2:0]};
@@ -159,6 +166,7 @@ module t ();
 `ifndef NO_SHORTREAL
       dpii_v_shortreal(i_f,o_f); if (o_f != i_f+1.5) $stop;
 `endif
+      dpii_v_bit64    (i_b64,o_b64); if (o_b64 !== ~i_b64) $stop;
       dpii_v_bit95    (i_b95,o_b95); if (o_b95 !== ~i_b95) $stop;
       dpii_v_bit96    (i_b96,o_b96); if (o_b96 !== ~i_b96) $stop;
 
@@ -190,4 +198,10 @@ module t ();
       $finish;
    end
 
+   always @ (posedge clk) begin
+      i_b <= ~i_b;
+      // This once mis-threw a BLKSEQ warning
+      dpii_v_bit (i_b,o_b); if (o_b !== ~i_b) $stop;
+   end
+
 endmodule

test_regress/t/t_dpi_import_c.cpp

@@ -101,6 +101,10 @@ void dpii_v_string   (const char* i, const char** o)	{ *o = i; }
 void dpii_v_real     (double i,      double* o)		{ *o = i + 1.5; }
 void dpii_v_shortreal(float i,       float* o)		{ *o = i + 1.5; }
 
+void dpii_v_bit64(const svBitVecVal* i, svBitVecVal* o)	{
+    o[0] = ~i[0];
+    o[1] = ~i[1];
+}
 void dpii_v_bit95(const svBitVecVal* i, svBitVecVal* o)	{
     o[0] = ~i[0];
     o[1] = ~i[1];

test_regress/t/t_emit_constw.pl

@@ -8,7 +8,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Version 2.0.
 
 compile (
-	 v_flags2 => [$Self->{v3}?'--Ox':''],
+	 verilator_flags2 => ['--Ox'],
 	 );
 
 execute (

test_regress/t/t_enum_overlap_bad.pl

@@ -7,6 +7,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 v_flags2 => ["--lint-only"],
 	 fails=>$Self->{v3},
@@ -14,7 +16,7 @@ compile (
 '%Error: t/t_enum_overlap_bad.v:\d+: Overlapping enumeration value: e1b
 %Error: t/t_enum_overlap_bad.v:\d+: ... Location of original declaration
 %Error: Exiting due to',
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_extend_class.pl

@@ -7,14 +7,15 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
-if ($Self->{v3}) {
-    compile (
-	     make_flags => "CPPFLAGS_ADD=-I$Self->{t_dir}",
-	     );
-    execute (
-	     check_finished=>1,
-	     );
-}
+$Self->{vlt} or $Self->skip("Verilator only test");
+
+compile (
+    make_flags => "CPPFLAGS_ADD=-I$Self->{t_dir}",
+    );
+
+execute (
+    check_finished=>1,
+    );
 
 ok(1);
 1;

test_regress/t/t_flag_bboxsys.pl

@@ -7,13 +7,15 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
-	 v_flags2 => ["--bbox-sys"],
-	 ) if $Self->{v3};
+	 verilator_flags2 => ["--bbox-sys"],
+	 );
 
 execute (
 	 check_finished=>1,
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_flag_nomod_bad.pl

@@ -7,13 +7,15 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 v_flags2 => ["--lint-only"],
 	 fails=>$Self->{v3},
 	 expect=>
 '%Error: No top level module found
 %Error: Exiting due to',
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_flag_skipidentical.pl

@@ -7,7 +7,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
-if ($Self->{v3}) {
+$Self->{vlt} or $Self->skip("Verilator only test");
+
+{
     compile ();
 
     my $outfile = "$Self->{obj_dir}/V".$Self->{name}.".cpp";

test_regress/t/t_flag_topmod2_bad.pl

@@ -7,6 +7,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 v_flags2 => ["--top-module a "],
 	 fails=>$Self->{v3},
@@ -14,7 +16,7 @@ compile (
 	 expect=>
 '%Error: Specified --top-module \'a\' isn.t at the top level, it.s under another cell.
 %Error: Exiting due to.*',
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_flag_topmodule.pl

@@ -7,13 +7,15 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 v_flags2 => ["--top-module b "],
-	 ) if $Self->{v3};
+	 );
 
 execute (
 	 check_finished=>1,
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_flag_topmodule_bad.pl

@@ -9,6 +9,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 top_filename("t/t_flag_topmodule.v");
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 fails=>$Self->{v3},
 	 nc=>0,  # Need to get it not to give the prompt
@@ -16,7 +18,7 @@ compile (
 '%Error-MULTITOP: t/t_flag_topmodule.v:\d+: Unsupported: Multiple top level modules: .*
 %Error-MULTITOP: t/t_flag_topmodule.v:\d+: Fix, or use --top-module option to select which you want.
 %Error: Exiting due to.*',
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_flag_topmodule_bad2.pl

@@ -9,6 +9,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 top_filename("t/t_flag_topmodule.v");
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 fails=>$Self->{v3},
 	 v_flags2 => ["--top-module notfound"],
@@ -16,7 +18,7 @@ compile (
 	 expect=>
 '%Error: Specified --top-module \'notfound\' was not found in design.
 %Error: Exiting due to.*',
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_flag_topmodule_inline.pl

@@ -7,13 +7,15 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 v_flags2 => ["--top-module b"],
-	 ) if $Self->{v3};
+	 );
 
 execute (
 	 check_finished=>1,
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_flag_werror_bad1.pl

@@ -9,6 +9,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 top_filename("t/t_flag_werror.v");
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 v_flags2 => ["--lint-only"],
 	 fails=>$Self->{v3},
@@ -16,7 +18,7 @@ compile (
 q{%Warning-WIDTH: t/t_flag_werror.v:\d+: Operator ASSIGNW expects 4 bits on the Assign RHS, but Assign RHS.s CONST '6'h2e' generates 6 bits.
 %Warning-WIDTH: Use .* and lint_on around source to disable this message.
 %Error: Exiting due to},
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_flag_wfatal.pl

@@ -9,6 +9,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 top_filename("t/t_flag_wfatal.v");
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
     v_flags2 => ["--lint-only -Wno-fatal"],
     fails=>0,
@@ -19,7 +21,7 @@ compile (
 q{%Warning-WIDTH: t/t_flag_wfatal.v:\d+: Operator ASSIGNW expects 4 bits on the Assign RHS, but Assign RHS.s CONST '6'h2e' generates 6 bits.
 %Warning-WIDTH: Use .* and lint_on around source to disable this message.
 },
-    ) if $Self->{v3};
+    );
 
 ok(1);
 1;

test_regress/t/t_func_bad.pl

@@ -13,9 +13,11 @@ compile (
 	 expect=>
 q{%Error: t/t_func_bad.v:\d+: Too few arguments in function call to FUNC 'add'
 %Error: t/t_func_bad.v:\d+: Too few arguments in function call to FUNC 'add'
+%Error: t/t_func_bad.v:\d+: Too few arguments in function call to FUNC 'add'
 %Error: t/t_func_bad.v:\d+: Too many arguments in function call to FUNC 'add'
 %Error: t/t_func_bad.v:\d+: Too few arguments in function call to TASK 'x'
 %Error: t/t_func_bad.v:\d+: Too few arguments in function call to TASK 'x'
+%Error: t/t_func_bad.v:\d+: Too few arguments in function call to TASK 'x'
 %Error: Exiting due to},
 	 );
 

test_regress/t/t_func_public.pl

@@ -8,7 +8,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Version 2.0.
 
 compile (
-	 v_flags2 => [$Self->{v3}?'+define+VERILATOR_PUBLIC_TASKS':''],
+	 verilator_flags2 => ['+define+VERILATOR_PUBLIC_TASKS'],
 	 fails => $fail,
 	 );
 

test_regress/t/t_func_rand.pl

@@ -7,15 +7,17 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 make_top_shell => 0,
 	 make_main => 0,
-	 v_flags2 => ["--exe $Self->{t_dir}/$Self->{name}.cpp"],
-	 ) if $Self->{v3};
+	 verilator_flags2 => ["--exe $Self->{t_dir}/$Self->{name}.cpp"],
+	 );
 
 execute (
 	 check_finished=>1,
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_gen_assign.pl

@@ -7,8 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_gen_if.pl

@@ -7,8 +7,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_inst_tree_inl0_pub1.pl

@@ -13,7 +13,7 @@ compile (
 	 verilator_flags2 => ['+define+NOUSE_INLINE', '+define+USE_PUBLIC', '--stats'],
 	 );
 
-if ($Self->{v3}) {
+if ($Self->{vlt}) {
     file_grep ($Self->{stats}, qr/Optimizations, Combined CFuncs\s+16/i);
 }
 

test_regress/t/t_leak.pl

@@ -7,14 +7,16 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 make_top_shell => 0,
 	 make_main => 0,
-	 v_flags2 => ["--exe $Self->{t_dir}/$Self->{name}.cpp"],
-	 ) if $Self->{v3};
+	 verilator_flags2 => ["--exe $Self->{t_dir}/$Self->{name}.cpp"],
+	 );
 
 execute (
 	 check_finished=>1,
-	 ) if $Self->{v3};
+	 );
 ok(1);
 1;

test_regress/t/t_lint_blksync_bad.pl

@@ -7,6 +7,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
     v_flags2 => ["--lint-only -Wwarn-BLKSEQ -Wwarn-COMBDLY"],
     fails=>1,
@@ -20,7 +22,7 @@ compile (
 %Warning-COMBDLY: \*\*\* See the manual before disabling this,
 %Warning-COMBDLY: else you may end up with different sim results.
 %Error: Exiting due to.*',
-    ) if $Self->{v3};
+    );
 
 ok(1);
 1;

test_regress/t/t_lint_blksync_loop.pl

@@ -7,13 +7,15 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
-    v_flags2 => ["--lint-only -Wwarn-BLKSEQ -Wwarn-COMBDLY"],
+    verilator_flags2 => ["--lint-only -Wwarn-BLKSEQ -Wwarn-COMBDLY"],
     fails=>0,
     verilator_make_gcc => 0,
     make_top_shell => 0,
     make_main => 0,
-    ) if $Self->{v3};
+    );
 
 ok(1);
 1;

test_regress/t/t_lint_declfilename.pl

@@ -7,12 +7,14 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
     v_flags2 => ["--lint-only"],
     verilator_make_gcc => 0,
     make_top_shell => 0,
     make_main => 0,
-    ) if $Self->{v3};
+    );
 
 ok(1);
 1;

test_regress/t/t_lint_declfilename_bad.pl

@@ -9,6 +9,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 top_filename("t/t_lint_declfilename.v");
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
     v_flags2 => ["--lint-only -Wall"],
     fails=>1,
@@ -19,7 +21,7 @@ compile (
 '%Warning-DECLFILENAME: t/t_lint_declfilename.v:6: Filename \'t_lint_declfilename\' does not match MODULE name: t
 %Warning-DECLFILENAME: Use .* to disable this message.
 %Error: Exiting due to.*',
-    ) if $Self->{v3};
+    );
 
 ok(1);
 1;

test_regress/t/t_lint_defparam.pl

@@ -7,12 +7,14 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
     v_flags2 => ["--lint-only"],
     verilator_make_gcc => 0,
     make_top_shell => 0,
     make_main => 0,
-    ) if $Self->{v3};
+    );
 
 ok(1);
 1;

test_regress/t/t_lint_defparam_bad.pl

@@ -9,6 +9,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 top_filename("t/t_lint_defparam.v");
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
     v_flags2 => ["--lint-only -Wwarn-style -Wno-DECLFILENAME"],
     fails=>1,
@@ -19,7 +21,7 @@ compile (
 '%Warning-DEFPARAM: t/t_lint_defparam.v:\d+: Suggest replace defparam with Verilog 2001 #\(.P\(...etc...\)\)
 %Warning-DEFPARAM: Use .* to disable this message.
 %Error: Exiting due to.*',
-	 ) if $Self->{v3};
+    );
 
 ok(1);
 1;

test_regress/t/t_lint_ifdepth_bad.pl

@@ -7,6 +7,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
     v_flags2 => ["--lint-only -Wall -Wno-DECLFILENAME --if-depth 10"],
     fails=>1,
@@ -17,7 +19,7 @@ compile (
 '%Warning-IFDEPTH: t/t_lint_ifdepth_bad.v:\d+: Deep \'if\' statement; suggest unique/priority to avoid slow logic
 %Warning-IFDEPTH: Use .* to disable this message.
 %Error: Exiting due to.*',
-    ) if $Self->{v3};
+    );
 
 ok(1);
 1;

test_regress/t/t_lint_implicit.pl

@@ -7,9 +7,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
-	 v_flags2 => ["-Wno-IMPLICIT"],
-	 ) if $Self->{v3};
+    verilator_flags2 => ["-Wno-IMPLICIT"],
+    );
 
 ok(1);
 1;

test_regress/t/t_lint_implicit_bad.pl

@@ -9,6 +9,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 top_filename("t/t_lint_implicit.v");
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 v_flags2 => ["--lint-only -Wwarn-IMPLICIT"],
 	 fails=>1,
@@ -19,7 +21,7 @@ compile (
 %Warning-IMPLICIT: t/t_lint_implicit.v:\d+: Signal definition not found, creating implicitly: dummy1
 %Warning-IMPLICIT: t/t_lint_implicit.v:\d+: Signal definition not found, creating implicitly: dummy2
 %Error: Exiting due to.*',
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_lint_implicit_def_bad.pl

@@ -7,15 +7,17 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
-	 v_flags2 => ["--lint-only -Wall -Wno-DECLFILENAME"],
+	 verilator_flags2 => ["--lint-only -Wall -Wno-DECLFILENAME"],
 	 fails=>1,
 	 expect=>
 '%Warning-IMPLICIT: t/t_lint_implicit_def_bad.v:\d+: Signal definition not found, creating implicitly: imp_warn
 %Warning-IMPLICIT: Use "/\* verilator lint_off IMPLICIT \*/" and lint_on around source to disable this message.
 %Error: t/t_lint_implicit_def_bad.v:\d+: Signal definition not found, and implicit disabled with `default_nettype: imp_err
 %Error: Exiting due to.*',
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_lint_incabspath.pl

@@ -7,12 +7,14 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
-    v_flags2 => ["--lint-only"],
+    verilator_flags2 => ["--lint-only"],
     verilator_make_gcc => 0,
     make_top_shell => 0,
     make_main => 0,
-    ) if $Self->{v3};
+    );
 
 ok(1);
 1;

test_regress/t/t_lint_incabspath_bad.pl

@@ -9,6 +9,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 top_filename("t/t_lint_incabspath.v");
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
     v_flags2 => ["--lint-only -Wall -Wno-DECLFILENAME"],
     fails=>1,
@@ -19,7 +21,7 @@ compile (
 '%Warning-INCABSPATH: t/t_lint_incabspath.v:\d+: Suggest `include with absolute path be made relative, and use \+include: /dev/null
 %Warning-INCABSPATH: Use .* to disable this message.
 %Error: Exiting due to.*',
-    ) if $Self->{v3};
+    );
 
 ok(1);
 1;

test_regress/t/t_lint_once_bad.pl

@@ -7,10 +7,12 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 make_top_shell => 0,
 	 make_main => 0,
-	 v_flags2 => ["--lint-only -Wwarn-UNUSED"],
+	 verilator_flags2 => ["--lint-only -Wwarn-UNUSED"],
 	 verilator_make_gcc => 0,
 	 fails=>1,
 	 expect=>
@@ -18,7 +20,7 @@ compile (
 %Warning-UNUSED: Use .* to disable this message.
 %Warning-UNUSED: t/t_lint_once_bad.v:\d+: Signal is not driven, nor used: unus2
 %Error: Exiting due to.*',
-	 ) if $Self->{v3};
+	 );
 
 ok(1);
 1;

test_regress/t/t_lint_only.pl

@@ -7,12 +7,14 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 make_top_shell => 0,
 	 make_main => 0,
 	 v_flags2 => ["--lint-only"],
 	 verilator_make_gcc => 0,
-	 ) if $Self->{v3};
+	 );
 
 foreach my $file (glob("$Self->{obj_dir}/*t_lint_only*")) {
     next if $file =~ /simx_compile.log/;  # Made by driver.pl, not Verilator

test_regress/t/t_lint_pindup_bad.pl

@@ -7,6 +7,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
     v_flags2 => ["--lint-only"],
     fails=>1,
@@ -22,7 +24,7 @@ compile (
 %Error: t/t_lint_pindup_bad.v:\d+: Duplicate pin connection: P
 %Error: t/t_lint_pindup_bad.v:\d+: ... Location of original pin connection
 %Error: Exiting due to.*',
-    ) if $Self->{v3};
+    );
 
 ok(1);
 1;

test_regress/t/t_lint_realcvt_bad.pl

@@ -7,6 +7,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 make_top_shell => 0,
 	 make_main => 0,
@@ -17,7 +19,7 @@ compile (
 '%Warning-REALCVT: t/t_lint_realcvt_bad.v:\d+: Implicit conversion of real to integer
 %Warning-REALCVT: Use .* to disable this message.
 %Error: Exiting due to.*',
-	 ) if $Self->{v3};
+    );
 
 ok(1);
 1;

test_regress/t/t_lint_restore_bad.pl

@@ -7,6 +7,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
 	 v_flags2 => ["--lint-only"],
 	 fails=>1,
@@ -14,7 +16,7 @@ compile (
 q{.*%Warning-WIDTH: t/t_lint_restore_bad.v:\d+: Operator ASSIGN expects 5 bits on the Assign RHS, but Assign RHS's CONST '64'h1' generates 64 bits.
 %Warning-WIDTH: Use .*
 %Error: Exiting due to.*},
-	 ) if $Self->{v3};
+    );
 
 ok(1);
 1;

test_regress/t/t_lint_setout_bad.pl

@@ -7,6 +7,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
+$Self->{vlt} or $Self->skip("Verilator only test");
+
 compile (
     v_flags2 => ["--lint-only"],
     fails=>1,
@@ -16,7 +18,7 @@ compile (
     expect=>
 '%Error: t/t_lint_setout_bad.v:\d+: Output port is connected to a constant pin, electrical short
 .*',
-    ) if $Self->{v3};
+    );
 
 ok(1);
 1;