Commit c143e134 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

more tweaking for cocotb

parent b11069c2

src/com/elphel/vdt/core/launching/VDTRunner.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -104,7 +104,7 @@ public class VDTRunner { 
	

	

	public void abortLaunch(String consoleName){

	public void abortLaunch(String consoleName){

		final VDTRunnerConfiguration runConfig=runningBuilds.resumeConfiguration(consoleName);

		final VDTRunnerConfiguration runConfig=runningBuilds.resumeConfiguration(consoleName);

    	Tool tool=ToolsCore.getTool(runConfig.getToolName());

    	Tool tool=ToolsCore.getTool(runConfig.getToolName()); // null pointer with Icarus/gtkwave - seems it is already closed sometimes

		tool.setDirty(false);

		tool.setDirty(false);

		tool.setState(TOOL_STATE.FAILURE);

		tool.setState(TOOL_STATE.FAILURE);

//		tool.setRunning(false);

//		tool.setRunning(false);

tools/Verilog/Cocotb.xml

+23 −10
Original line number Original line Diff line number Diff line
@@ -48,11 +48,12 @@ 
		<syntax name="ListEqMultilineAbsExtra"     format="%%ParamName += %($(PROJECT_ROOT)/%%ParamValue%| \\n%)" />

		<syntax name="ListEqMultilineAbsExtra"     format="%%ParamName += %($(PROJECT_ROOT)/%%ParamValue%| \\n%)" />

		<syntax name="MakeCleanItems"              format="clean::\n%(\t-@rm -f %%ParamValue%|\n%)"/>

		<syntax name="MakeCleanItems"              format="clean::\n%(\t-@rm -f %%ParamValue%|\n%)"/>

		<syntax name="ListEqComma"                 format="%%ParamName  = %(%%ParamValue%|,%)" />

		<syntax name="ListEqComma"                 format="%%ParamName  = %(%%ParamValue%|,%)" />

		<syntax name="CocotbIncludeDirSyntax"      format="%%ParamName += %(-I%%ParamValue%| %)" />

		<syntax name="CocotbIncludeDirSyntax"      format="%%ParamName += %(-I%%ParamValue%| \\n%)" />

		<syntax name="CocotbTopModulesOtherSyntax" format="%%ParamName += %(-s%%ParamValue%| %)" />

		<syntax name="CocotbTopModulesOtherSyntax" format="%%ParamName += %(-s%%ParamValue%| \\n%)" />

		<syntax name="CocotbModuleLibrarySyntax"   format="%%ParamName += %(-y%%ParamValue%| %)" />

		<syntax name="CocotbModuleLibrarySyntax"   format="%%ParamName += %(-y%%ParamValue%| \\n%)" />

		





		<syntax name="D_ParamValueSyntax"          format="%%ParamName += -D%%ParamValue" />

		<syntax name="D_ParamValuesSyntax"         format="%(-D%%ParamValue%| )" />

		

		

		<syntax name="D_ParamSyntax"         format="-D%%ParamName" />

		<syntax name="D_ParamSyntax"         format="-D%%ParamName" />

		<syntax name="g_ParamSyntax"         format="-g%%ParamName" />

		<syntax name="g_ParamSyntax"         format="-g%%ParamName" />
@@ -79,6 +80,7 @@ 
		

		

 		<syntax name="FstParamFileSyntax"

 		<syntax name="FstParamFileSyntax"

			format="parameter fstname=&quot;%%ParamValue-%%BuildStamp.fst&quot;;" />

			format="parameter fstname=&quot;%%ParamValue-%%BuildStamp.fst&quot;;" />

			

		<syntax name="IncludeParamSyntax" format="%(%%ParamValue%|\n%)" />

		<syntax name="IncludeParamSyntax" format="%(%%ParamValue%|\n%)" />
@@ -209,8 +211,8 @@ 
			default="" label="Select additional Verilog files to include" omit="" readonly="false"

			default="" label="Select additional Verilog files to include" omit="" readonly="false"

			visible="true" />

			visible="true" />







	    <parameter id="ExtraDefines" outid="MODULE" type="Stringlist" label="Simulation Python module(s)" tooltip="The name of the module(s) to search for test functions."



			 format="ListEqComma" default="" omit="" readonly="false" visible="true" />









		<parameter id="Param_Shell_Options" label="Param_Shell_Options"

		<parameter id="Param_Shell_Options" label="Param_Shell_Options"
@@ -447,6 +449,7 @@ 
			<line name="command_line"

			<line name="command_line"

			 sep=" "

			 sep=" "

			 success = "SIMULATION FINISHED SUCCESSFULLY"

			 success = "SIMULATION FINISHED SUCCESSFULLY"

			 failure = "ERROR|CRITICAL"

	         >

	         >

				"%Param_Shell_Options"

				"%Param_Shell_Options"

				"%Param_PreExe"

				"%Param_PreExe"
@@ -484,8 +487,12 @@ 
			

			

			<line name="IverilogIncludeFile" dest="iverilog_include_file"

			<line name="IverilogIncludeFile" dest="iverilog_include_file"

				sep="\n">

				sep="\n">

				"%FstDumpFileParameter"

				"`ifndef IVERILOG_INCLUDE"

				"    `define IVERILOG_INCLUDE"

				"    `define ROOTPATH \&quot;%%ProjectPath\&quot;"

				"    %FstDumpFileParameter // SuppressThisWarning VEditor - maybe not used"

				"    %IncludeParametersList"

				"    %IncludeParametersList"

				"`endif"

			</line>

			</line>

			<line name="CocotbMakefile" dest="cocotbMakefile"

			<line name="CocotbMakefile" dest="cocotbMakefile"

				sep="\n">

				sep="\n">
@@ -500,13 +507,19 @@ 
				"%CocotbSIM"

				"%CocotbSIM"

				"%CocotbCOMPILE_ARGS"

				"%CocotbCOMPILE_ARGS"

				<!-- Always include top project dir (where IVERILOG_INCLUDE.v is) -->

				<!-- Always include top project dir (where IVERILOG_INCLUDE.v is) -->

				"COMPILE_ARGS += -I/$(PROJECT_ROOT)"

				"COMPILE_ARGS += -DCOCOTB"

				<!-- So code may use PROJECT_ROOT_PATH to reference data files

				     Does not work when passing string parameters, had to use include file -->

<!-- 			"COMPILE_ARGS += -DROOTPATH=\&quot;%%ProjectPath\&quot;"

				"COMPILE_ARGS += -DFSTNAME=\&quot;%%ParamValue-%%BuildStamp.fst\&quot;"-->

				

				<if ShowWaves="true">

				<if ShowWaves="true">

					"COMPILE_ARGS += -DTRACE"

					"COMPILE_ARGS += -DTRACE"

				</if>

				</if>

				"%CocotbTopModulesOther"

				"%CocotbTopModulesOther"

				"%CocotbModuleLibrary"

				"%CocotbModuleLibrary"

				

				

				"COMPILE_ARGS += -I$(PROJECT_ROOT)"

				"%CocotbIncludeDir"

				"%CocotbIncludeDir"

				"%CocotbSIM_ARGS"

				"%CocotbSIM_ARGS"

				"%CocotbEXTRA_ARGS"

				"%CocotbEXTRA_ARGS"