Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Import build flags from environment (a la Chisel2). #245

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Import build flags from environment (a la Chisel2). #245

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
042e84a
Import build flags from environment (a la Chisel2).
ucbjrl May 3, 2019
2b93c22
Add missing newline at EOF
ucbjrl May 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions src/main/scala/chisel3/iotesters/PeekPokeTesterUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ private[iotesters] object verilogToIVL extends EditableBuildCSimulatorCommand {
cFlags: Seq[String]
): String = {
Seq("cd", dir.toString, "&&") ++
Seq("g++") ++ cFlags ++ Seq("vpi.cpp", "vpi_register.cpp", "&&") ++
Seq(ImportEnvironmentBuildFlags.CXX) ++ cFlags ++ Seq("vpi.cpp", "vpi_register.cpp", "&&") ++
Seq("iverilog") ++ flags mkString " "
}

Expand All @@ -195,6 +195,7 @@ private[iotesters] object verilogToIVL extends EditableBuildCSimulatorCommand {
) ++ moreIvlFlags

val ivlCFlags = Seq(
ImportEnvironmentBuildFlags.CXXFLAGS,
s"-o $topModule.vpi",
"-D__ICARUS__",
"-I$IVL_HOME",
Expand Down Expand Up @@ -258,8 +259,8 @@ private[iotesters] object verilogToVCS extends EditableBuildCSimulatorCommand {
moreVcsFlags: Seq[String] = Seq.empty[String],
moreVcsCFlags: Seq[String] = Seq.empty[String]): (Seq[String], Seq[String]) = {

val ccFlags = Seq("-I$VCS_HOME/include", "-I$dir", "-fPIC", "-std=c++11") ++ moreVcsCFlags

val ccFlags = Seq(ImportEnvironmentBuildFlags.CXXFLAGS, "-I$VCS_HOME/include", "-I$dir", "-fPIC", "-std=c++11") ++ moreVcsCFlags
val ldFlags = Seq(ImportEnvironmentBuildFlags.LDFLAGS, "-lstdc++")
val vcsFlags = Seq("-full64",
"-quiet",
"-timescale=1ns/1ps",
Expand All @@ -270,7 +271,8 @@ private[iotesters] object verilogToVCS extends EditableBuildCSimulatorCommand {
"+vcs+initreg+random",
"+define+CLOCK_PERIOD=1",
"-P", "vpi.tab",
"-cpp", "g++", "-O2", "-LDFLAGS", "-lstdc++",
"-cpp", ImportEnvironmentBuildFlags.CXX, "-O2",
"-LDFLAGS", "\"%s\"".format(ldFlags mkString " "),
"-CFLAGS", "\"%s\"".format(ccFlags mkString " ")) ++
moreVcsFlags

Expand Down Expand Up @@ -326,6 +328,7 @@ private[iotesters] object verilogToVerilator extends EditableBuildCSimulatorComm
moreVerilatorCFlags: Seq[String] = Seq.empty[String]): (Seq[String], Seq[String]) = {

val ccFlags = Seq(
ImportEnvironmentBuildFlags.CXXFLAGS,
"-Wno-undefined-bool-conversion",
"-O1",
s"-DTOP_TYPE=V$topModule",
Expand Down Expand Up @@ -408,3 +411,14 @@ private[iotesters] object TesterProcess {
def kill(p: FirrtlTerpBackend) {
}
}

// Import various compiler build flags from the environment.
object ImportEnvironmentBuildFlags {
import scala.util.Properties.envOrElse
val CC = envOrElse("CC", "g++" )
val CXX = envOrElse("CXX", "g++" )
val CCFLAGS = envOrElse("CCFLAGS", "")
val CXXFLAGS = envOrElse("CXXFLAGS", "")
val CPPFLAGS = envOrElse("CPPFLAGS", "")
val LDFLAGS = envOrElse("LDFLAGS", "")
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing newline?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Will fix.

4 changes: 3 additions & 1 deletion src/test/scala/chisel3/iotesters/ToolChainSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ class ToolChainSpec extends FreeSpec with Matchers {
s"Ability to edit vcs command line - $builderName" - {
// Build the expected command (default arguments)
val expectedCommand = builder.constructCSimulatorCommand(dummyTop, dummyDir, dummyHarness)
val expectedMultipleEditVCSCommand = """cd dir && vcs -full64 -loud -timescale=1ns/1ps -debug_pp -Mdir=top.csrc +vcs+lic+wait +vcs+initreg+random +define+CLOCK_PERIOD=1 -P vpi.tab -cpp g++ -O2 -LDFLAGS -lstdc++ -CFLAGS "-I$VCS_HOME/include -I$dir -fPIC -std=c++11" -o top top.v harness.v vpi.cpp"""
val cxxFlags = ImportEnvironmentBuildFlags.CXXFLAGS + " -I$VCS_HOME/include -I$dir -fPIC -std=c++11"
val ldFlags = ImportEnvironmentBuildFlags.LDFLAGS + " -lstdc++"
val expectedMultipleEditVCSCommand = s"""cd dir && vcs -full64 -loud -timescale=1ns/1ps -debug_pp -Mdir=top.csrc +vcs+lic+wait +vcs+initreg+random +define+CLOCK_PERIOD=1 -P vpi.tab -cpp g++ -O2 -LDFLAGS "$ldFlags" -CFLAGS "$cxxFlags" -o top top.v harness.v vpi.cpp"""

"can be done from a single edit on command line" in {
val dummyArg = "-A-dummy-arg"
Expand Down