Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
H
Hdlmake
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
15
Issues
15
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Hdlmake
Commits
c0a0320a
Commit
c0a0320a
authored
Mar 16, 2020
by
Tristan Gingold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xilinx.py: add all source files at once. Update baselines.
parent
4d6eef48
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
84 additions
and
33 deletions
+84
-33
makefilesyn.py
hdlmake/tools/makefilesyn.py
+2
-0
planahead.py
hdlmake/tools/planahead.py
+5
-5
vivado.py
hdlmake/tools/vivado.py
+17
-17
xilinx.py
hdlmake/tools/xilinx.py
+44
-7
Makefile.ref
testsuite/014planahead/Makefile.ref
+4
-1
Makefile.ref
testsuite/018vivado/Makefile.ref
+4
-1
Makefile.ref
testsuite/023xci/Makefile.ref
+4
-1
Makefile.ref
testsuite/054vivado_props/Makefile.ref
+4
-1
No files found.
hdlmake/tools/makefilesyn.py
View file @
c0a0320a
...
...
@@ -110,12 +110,14 @@ endif""")
fileset_dict
.
update
(
self
.
SUPPORTED_FILES
)
# Create files.tcl target
self
.
writeln
(
'files.tcl:'
)
# Extra commands before source files.
if
"files"
in
self
.
_tcl_controls
:
for
command
in
self
.
_tcl_controls
[
"files"
]
.
split
(
'
\n
'
):
command_string
=
'
\t\t
@echo {0} >> $@'
.
format
(
command
)
if
shell
.
check_windows_commands
():
command_string
=
command_string
.
replace
(
"'"
,
""
)
self
.
writeln
(
command_string
)
# Add each source file
for
srcfile
in
self
.
fileset
.
sort
():
command
=
fileset_dict
.
get
(
type
(
srcfile
))
# Put the file in files.tcl only if it is supported.
...
...
hdlmake/tools/planahead.py
View file @
c0a0320a
...
...
@@ -43,11 +43,11 @@ class ToolPlanAhead(ToolXilinx):
'synopsys'
,
'unimacro'
,
'unisim'
,
'XilinxCoreLib'
]
SUPPORTED_FILES
=
{
UCFFile
:
ToolXilinx
.
_XILINX_SOURCE
,
NGCFile
:
ToolXilinx
.
_XILINX_SOURCE
,
XMPFile
:
ToolXilinx
.
_XILINX_SOURCE
,
BMMFile
:
ToolXilinx
.
_XILINX_SOURCE
,
XCOFile
:
ToolXilinx
.
_XILINX_SOURCE
}
UCFFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
NGCFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
XMPFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
BMMFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
XCOFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
}
CLEAN_TARGETS
=
{
'clean'
:
[
"planAhead_*"
,
"planAhead.*"
,
".Xil"
,
"$(PROJECT).cache"
,
"$(PROJECT).data"
,
...
...
hdlmake/tools/vivado.py
View file @
c0a0320a
...
...
@@ -48,26 +48,26 @@ class ToolVivado(ToolXilinx):
SYSTEM_LIBS
=
[
'xilinx'
]
SUPPORTED_FILES
=
{
XDCFile
:
ToolXilinx
.
_XILINX_SOURCE
,
XCFFile
:
ToolXilinx
.
_XILINX_SOURCE
,
NGCFile
:
ToolXilinx
.
_XILINX_SOURCE
,
XMPFile
:
ToolXilinx
.
_XILINX_SOURCE
,
XCOFile
:
ToolXilinx
.
_XILINX_SOURCE
,
COEFile
:
ToolXilinx
.
_XILINX_SOURCE
,
BDFile
:
ToolXilinx
.
_XILINX_SOURCE
,
BMMFile
:
ToolXilinx
.
_XILINX_SOURCE
,
TCLFile
:
ToolXilinx
.
_XILINX_SOURCE
,
MIFFile
:
ToolXilinx
.
_XILINX_SOURCE
,
RAMFile
:
ToolXilinx
.
_XILINX_SOURCE
,
VHOFile
:
ToolXilinx
.
_XILINX_SOURCE
,
VEOFile
:
ToolXilinx
.
_XILINX_SOURCE
}
XDCFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
XCFFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
NGCFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
XMPFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
XCOFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
COEFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
BDFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
BMMFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
TCLFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
MIFFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
RAMFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
VHOFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
,
VEOFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
}
SUPPORTED_FILES
.
update
(
ToolXilinx
.
SUPPORTED_FILES
)
HDL_FILES
=
{
VHDLFile
:
ToolXilinx
.
_XILINX_SOURCE
,
VerilogFile
:
ToolXilinx
.
_XILINX_SOURCE
,
SVFile
:
ToolXilinx
.
_XILINX_SOURCE
,
XCIFile
:
ToolXilinx
.
_XILINX_SOURCE
}
VHDLFile
:
ToolXilinx
.
_XILINX_
VHDL_
SOURCE
,
VerilogFile
:
ToolXilinx
.
_XILINX_
VERILOG_
SOURCE
,
SVFile
:
ToolXilinx
.
_XILINX_
VERILOG_
SOURCE
,
XCIFile
:
ToolXilinx
.
_XILINX_
ANY_
SOURCE
}
CLEAN_TARGETS
=
{
'clean'
:
[
".Xil"
,
"*.jou"
,
"*.log"
,
"*.pb"
,
"*.dmp"
,
"$(PROJECT).cache"
,
"$(PROJECT).data"
,
"work"
,
...
...
hdlmake/tools/xilinx.py
View file @
c0a0320a
...
...
@@ -26,7 +26,8 @@
from
__future__
import
absolute_import
from
.makefilesyn
import
MakefileSyn
from
..sourcefiles.srcfile
import
VHDLFile
,
VerilogFile
,
SVFile
,
TCLFile
from
..sourcefiles.srcfile
import
VHDLFile
,
VerilogFile
,
SVFile
,
TCLFile
,
SourceFile
from
..util
import
shell
import
logging
...
...
@@ -34,15 +35,18 @@ class ToolXilinx(MakefileSyn):
"""Class providing the interface for Xilinx Vivado synthesis"""
_XILINX_
SOURCE
=
(
"add_files -norecurse {srcfile}; "
"set_property IS_GLOBAL_INCLUDE 1 [get_files {srcfile}]; "
_XILINX_
ANY_SOURCE
=
""
_XILINX_VHDL_SOURCE
=
(
"set_property LIBRARY {library} [get_files {srcfile}]"
)
_XILINX_VERILOG_SOURCE
=
(
"set_property IS_GLOBAL_INCLUDE 1 [get_files {srcfile}]; "
)
HDL_FILES
=
{
VHDLFile
:
_XILINX_SOURCE
,
VerilogFile
:
_XILINX_SOURCE
,
SVFile
:
_XILINX_SOURCE
}
VHDLFile
:
_XILINX_
VHDL_
SOURCE
,
VerilogFile
:
_XILINX_
VERILOG_
SOURCE
,
SVFile
:
_XILINX_
VERILOG_
SOURCE
}
SUPPORTED_FILES
=
{
TCLFile
:
'source {srcfile}'
}
...
...
@@ -97,6 +101,39 @@ $(TCL_CLOSE)'''
properties
.
extend
(
syn_properties
)
return
properties
def
_makefile_syn_files
(
self
):
"""Write the files TCL section of the Makefile"""
fileset_dict
=
{}
fileset_dict
.
update
(
self
.
HDL_FILES
)
fileset_dict
.
update
(
self
.
SUPPORTED_FILES
)
# Create files.tcl target
self
.
writeln
(
'files.tcl:'
)
# Xilinx has no extra commands before source files.
assert
"files"
not
in
self
.
_tcl_controls
# Add all files at once.
q
=
''
if
shell
.
check_windows_commands
()
else
'"'
self
.
writeln
(
'
\t
echo add_files -norecurse {q}{{{q} >> $@'
.
format
(
q
=
q
))
for
srcfile
in
self
.
fileset
.
sort
():
if
type
(
srcfile
)
in
fileset_dict
:
self
.
writeln
(
'
\t
echo {q} {srcfile}{q} >> $@'
.
format
(
q
=
q
,
srcfile
=
shell
.
tclpath
(
srcfile
.
rel_path
())))
self
.
writeln
(
'
\t
echo {q}}}{q} >> $@'
.
format
(
q
=
q
))
# Add each source file
for
srcfile
in
self
.
fileset
.
sort
():
command
=
fileset_dict
.
get
(
type
(
srcfile
))
# Put the file in files.tcl only if it is supported.
if
command
is
not
None
:
# Libraries are defined only for hdl files.
if
isinstance
(
srcfile
,
SourceFile
):
library
=
srcfile
.
library
else
:
library
=
None
command
=
command
.
format
(
srcfile
=
shell
.
tclpath
(
srcfile
.
rel_path
()),
library
=
library
)
self
.
writeln
(
'
\t
echo {q}{cmd}{q} >> $@'
.
format
(
q
=
q
,
cmd
=
command
))
self
.
writeln
()
def
_makefile_syn_tcl
(
self
):
"""Create a Xilinx synthesis project by TCL"""
prop_val
=
'set_property "{0}" "{1}" [{2}]'
...
...
testsuite/014planahead/Makefile.ref
View file @
c0a0320a
...
...
@@ -28,7 +28,10 @@ endif
all
:
bitstream
files.tcl
:
echo
"add_files -norecurse ../files/gate.vhdl; set_property IS_GLOBAL_INCLUDE 1 [get_files ../files/gate.vhdl]; set_property LIBRARY work [get_files ../files/gate.vhdl]"
>>
$@
echo
add_files
-norecurse
"{"
>>
$@
echo
" ../files/gate.vhdl"
>>
$@
echo
"}"
>>
$@
echo
"set_property LIBRARY work [get_files ../files/gate.vhdl]"
>>
$@
SYN_PRE_PROJECT_CMD
:=
SYN_POST_PROJECT_CMD
:=
...
...
testsuite/018vivado/Makefile.ref
View file @
c0a0320a
...
...
@@ -28,7 +28,10 @@ endif
all
:
bitstream
files.tcl
:
echo
"add_files -norecurse ../files/gate.vhdl; set_property IS_GLOBAL_INCLUDE 1 [get_files ../files/gate.vhdl]; set_property LIBRARY work [get_files ../files/gate.vhdl]"
>>
$@
echo
add_files
-norecurse
"{"
>>
$@
echo
" ../files/gate.vhdl"
>>
$@
echo
"}"
>>
$@
echo
"set_property LIBRARY work [get_files ../files/gate.vhdl]"
>>
$@
SYN_PRE_PROJECT_CMD
:=
SYN_POST_PROJECT_CMD
:=
...
...
testsuite/023xci/Makefile.ref
View file @
c0a0320a
...
...
@@ -28,7 +28,10 @@ endif
all
:
bitstream
files.tcl
:
echo
"add_files -norecurse ../files/gate.vhdl; set_property IS_GLOBAL_INCLUDE 1 [get_files ../files/gate.vhdl]; set_property LIBRARY work [get_files ../files/gate.vhdl]"
>>
$@
echo
add_files
-norecurse
"{"
>>
$@
echo
" ../files/gate.vhdl"
>>
$@
echo
"}"
>>
$@
echo
"set_property LIBRARY work [get_files ../files/gate.vhdl]"
>>
$@
SYN_PRE_PROJECT_CMD
:=
SYN_POST_PROJECT_CMD
:=
...
...
testsuite/054vivado_props/Makefile.ref
View file @
c0a0320a
...
...
@@ -28,7 +28,10 @@ endif
all
:
bitstream
files.tcl
:
echo
"add_files -norecurse ../files/gate.vhdl; set_property IS_GLOBAL_INCLUDE 1 [get_files ../files/gate.vhdl]; set_property LIBRARY work [get_files ../files/gate.vhdl]"
>>
$@
echo
add_files
-norecurse
"{"
>>
$@
echo
" ../files/gate.vhdl"
>>
$@
echo
"}"
>>
$@
echo
"set_property LIBRARY work [get_files ../files/gate.vhdl]"
>>
$@
SYN_PRE_PROJECT_CMD
:=
SYN_POST_PROJECT_CMD
:=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment