FIRRTL cherry-pick 833/859 fix

Merge branch '1.1.x' into 1.1.5

build.sbt

@@ -14,7 +14,7 @@ organization := "edu.berkeley.cs"
 
 name := "firrtl"
 
-version := "1.1.4"
+version := "1.1.5"
 
 scalaVersion := "2.12.4"
 

src/main/scala/firrtl/Emitter.scala

@@ -685,13 +685,19 @@ class VerilogEmitter extends SeqTransform with Emitter {
         emit(Seq("`ifdef RANDOMIZE_MEM_INIT"))
         emit(Seq("`define RANDOMIZE"))
         emit(Seq("`endif"))
+        emit(Seq("`ifndef RANDOM"))
+        emit(Seq("`define RANDOM $random"))
+        emit(Seq("`endif"))
         emit(Seq("`ifdef RANDOMIZE"))
         emit(Seq("  integer initvar;"))
         emit(Seq("  initial begin"))
+        emit(Seq("    `ifdef INIT_RANDOM"))
+        emit(Seq("      `INIT_RANDOM"))
+        emit(Seq("    `endif"))
         // This enables test benches to set the random values at time 0.001,
-        //  then start the simulation later
+        //   then start the simulation later
         // Verilator does not support delay statements, so they are omitted.
-        emit(Seq("    `ifndef verilator"))
+        emit(Seq("    `ifndef VERILATOR"))
         emit(Seq("      #0.002 begin end"))
         emit(Seq("    `endif"))
         for (x <- initials) emit(Seq(tab, x))