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
4468bbdc
Commit
4468bbdc
authored
Nov 01, 2019
by
Tristan Gingold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
isim.py: minor rewrite.
parent
27be18a6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
61 deletions
+26
-61
isim.py
hdlmake/tools/isim.py
+16
-52
makefile.py
hdlmake/tools/makefile.py
+10
-0
makefilesim.py
hdlmake/tools/makefilesim.py
+0
-9
No files found.
hdlmake/tools/isim.py
View file @
4468bbdc
...
...
@@ -113,6 +113,11 @@ class ToolISim(MakefileSim):
default_options
+
__get_rid_of_isim_incdirs
(
self
.
manifest_dict
.
get
(
"vlog_opt"
,
''
)))
def
_makefile_syn_file_rule
(
self
,
file_aux
):
"""Generate target and prerequisites for :param file_aux:"""
self
.
write
(
"{}: {} "
.
format
(
self
.
get_stamp_file
(
file_aux
),
file_aux
.
rel_path
()))
self
.
writeln
(
' '
.
join
([
fname
.
rel_path
()
for
fname
in
file_aux
.
depends_on
]))
def
_makefile_sim_compilation
(
self
):
"""Print the compile simulation target for Xilinx ISim"""
fileset
=
self
.
fileset
...
...
@@ -154,67 +159,33 @@ fuse:
# "${XILINX_INI_PATH}/xilinxsim.ini"]))
# rules for all _primary.dat files for sv
# incdir = ""
objs
=
[]
for
vl_file
in
fileset
.
filter
(
VerilogFile
)
.
sort
():
comp_obj
=
os
.
path
.
join
(
vl_file
.
library
,
vl_file
.
purename
)
objs
.
append
(
comp_obj
)
# self.write(os.path.join(vl_file.library, vl_file.purename,
# '.'+vl_file.purename+"_"+vl_file.extension())+': ')
# self.writeln(".PHONY: " + os.path.join(comp_obj,
# '.'+vl_file.purename+"_"+vl_file.extension()))
self
.
write
(
os
.
path
.
join
(
comp_obj
,
'.'
+
vl_file
.
purename
+
"_"
+
vl_file
.
extension
(
))
+
': '
)
self
.
write
(
vl_file
.
rel_path
()
+
' '
)
self
.
writeln
(
' '
.
join
([
fname
.
rel_path
()
for
fname
in
vl_file
.
depends_on
]))
self
.
write
(
"
\t\t
vlogcomp -work "
+
vl_file
.
library
+
"=."
+
shell
.
makefile_slash_char
()
+
vl_file
.
library
)
self
.
_makefile_syn_file_rule
(
vl_file
)
self
.
write
(
"
\t\t
vlogcomp -work {lib}=.{slash}{lib}"
.
format
(
lib
=
vl_file
.
library
,
slash
=
shell
.
makefile_slash_char
()))
self
.
write
(
" $(VLOGCOMP_FLAGS) "
)
# if isinstance(vl_file, SVFile):
# self.write(" -sv ")
# incdir = "-i "
# incdir += " -i ".join(vl_file.include_dirs)
# incdir += " "
if
vl_file
.
include_dirs
:
self
.
write
(
' -i '
)
self
.
write
(
' '
.
join
(
vl_file
.
include_dirs
))
self
.
writeln
(
" $<"
)
self
.
write
(
"
\t\t
@"
+
shell
.
mkdir_command
()
+
" $(dir $@)"
)
self
.
writeln
(
" && "
+
shell
.
touch_command
()
+
" $@
\n\n
"
)
self
.
_makefile_sim_file_touch_stamp
(
)
self
.
writeln
()
self
.
write
(
"
\n
"
)
# list rules for all _primary.dat files for vhdl
for
vhdl_file
in
fileset
.
filter
(
VHDLFile
)
.
sort
():
lib
=
vhdl_file
.
library
purename
=
vhdl_file
.
purename
comp_obj
=
os
.
path
.
join
(
lib
,
purename
)
objs
.
append
(
comp_obj
)
# each .dat depends on corresponding .vhd file and its dependencies
# self.write(os.path.join(lib, purename, "."+purename+"_"
# + vhdl_file.extension()) + ": "+ vhdl_file.rel_path()+" "
# + os.path.join(lib, purename, "."+purename) + '\n')
# self.writeln(".PHONY: " + os.path.join(comp_obj,
# "."+purename+"_"+ vhdl_file.extension()))
self
.
write
(
os
.
path
.
join
(
comp_obj
,
"."
+
purename
+
"_"
+
vhdl_file
.
extension
(
))
+
": "
+
vhdl_file
.
rel_path
(
)
+
" "
+
os
.
path
.
join
(
lib
,
purename
,
"."
+
purename
)
+
'
\n
'
)
self
.
writeln
(
' '
.
join
([
"
\t\t
vhpcomp $(VHPCOMP_FLAGS)"
,
"-work"
,
lib
+
"=."
+
shell
.
makefile_slash_char
()
+
lib
,
"$< "
]))
self
.
write
(
self
.
get_stamp_file
(
vhdl_file
)
+
": "
+
vhdl_file
.
rel_path
()
+
" "
+
os
.
path
.
join
(
lib
,
purename
,
"."
+
purename
)
+
'
\n
'
)
self
.
writeln
(
"
\t\t
vhpcomp $(VHPCOMP_FLAGS) -work {lib}=.{slash}{lib} $< "
.
format
(
lib
=
lib
,
slash
=
shell
.
makefile_slash_char
()))
self
.
writeln
(
"
\t\t
@"
+
shell
.
mkdir_command
()
+
" $(dir $@) && "
+
shell
.
touch_command
()
+
" $@
\n
"
)
self
.
writeln
()
...
...
@@ -228,14 +199,7 @@ fuse:
# if len(vhdl_file.depends_on) != 0:
self
.
write
(
os
.
path
.
join
(
lib
,
purename
,
"."
+
purename
)
+
":"
)
for
dep_file
in
vhdl_file
.
depends_on
:
if
dep_file
in
fileset
:
name
=
dep_file
.
purename
self
.
write
(
"
\\\n
"
+
os
.
path
.
join
(
dep_file
.
library
,
name
,
"."
+
name
+
"_"
+
dep_file
.
extension
()))
else
:
self
.
write
(
"
\\\n
"
+
os
.
path
.
join
(
dep_file
.
rel_path
()))
self
.
write
(
"
\\\n
"
+
self
.
get_stamp_file
(
dep_file
))
self
.
write
(
'
\n
'
)
self
.
writeln
(
"
\t\t
@"
+
shell
.
mkdir_command
()
+
" $(dir $@) && "
+
shell
.
touch_command
()
+
" $@
\n
"
)
hdlmake/tools/makefile.py
View file @
4468bbdc
...
...
@@ -29,6 +29,7 @@ import logging
import
six
from
..util
import
shell
from
..util
import
path
as
path_mod
class
ToolMakefile
(
object
):
...
...
@@ -97,6 +98,15 @@ class ToolMakefile(object):
else
:
return
self
.
TOOL_INFO
[
"linux_bin"
]
def
get_stamp_file
(
self
,
dep_file
):
"""Stamp file for source file :param file:"""
name
=
dep_file
.
purename
return
os
.
path
.
join
(
dep_file
.
library
,
name
,
".{}_{}"
.
format
(
name
,
dep_file
.
extension
()))
def
_makefile_sim_file_touch_stamp
(
self
):
self
.
write
(
"
\t\t
@"
+
shell
.
mkdir_command
()
+
" $(dir $@)"
)
self
.
writeln
(
" && "
+
shell
.
touch_command
()
+
" $@
\n
"
)
def
makefile_check_tool
(
self
,
path_key
):
"""Check if the binary is available in the O.S. environment"""
name
=
self
.
TOOL_INFO
[
'name'
]
...
...
hdlmake/tools/makefilesim.py
View file @
4468bbdc
...
...
@@ -63,11 +63,6 @@ TOP_MODULE := {top_module}
self
.
writeln
(
"#target for performing local simulation
\n
"
"local: sim_pre_cmd simulation sim_post_cmd
\n
"
)
def
get_stamp_file
(
self
,
dep_file
):
"""Stamp file for source file :param file:"""
name
=
dep_file
.
purename
return
os
.
path
.
join
(
dep_file
.
library
,
name
,
".{}_{}"
.
format
(
name
,
dep_file
.
extension
()))
def
_makefile_sim_sources_lang
(
self
,
name
,
klass
):
"""Generic method to write the simulation Makefile HDL sources"""
fileset
=
self
.
fileset
...
...
@@ -104,10 +99,6 @@ TOP_MODULE := {top_module}
self
.
write
(
"
\\\n
{}"
.
format
(
path_mod
.
relpath
(
dep_file
,
cwd
)))
self
.
writeln
()
def
_makefile_sim_file_touch_stamp
(
self
):
self
.
write
(
"
\t\t
@"
+
shell
.
mkdir_command
()
+
" $(dir $@)"
)
self
.
writeln
(
" && "
+
shell
.
touch_command
()
+
" $@
\n
"
)
def
_makefile_sim_dep_files
(
self
):
"""Print dummy targets to handle file dependencies"""
for
file_aux
in
self
.
fileset
.
sort
():
...
...
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