Skip to content

Commit

Permalink
Simplify lint targets
Browse files Browse the repository at this point in the history
The only core which needs lint waivers is ibex_core.core; it will then
inherit those waivers to other cores, such as ibex_core_tracing.core,
and higher-up users of these cores (such as the simple system).

Also remove the Verible lint configuration, which happens to be the
default by now. This fixes lowRISC#736 by making it unnecessary.
  • Loading branch information
imphil committed Jul 3, 2020
1 parent c436ea1 commit 3bc1054
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 21 deletions.
4 changes: 0 additions & 4 deletions ibex_core.core
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,6 @@ targets:
# RAM primitives wider than 64bit (required for ECC) fail to build in
# Verilator without increasing the unroll count (see Verilator#1266)
- "--unroll-count 72"
veriblelint:
ruleset: default
rules:
- "-parameter-name-style"
format:
filesets:
- files_rtl
Expand Down
20 changes: 3 additions & 17 deletions ibex_core_tracing.core
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ filesets:
- rtl/ibex_core_tracing.sv
file_type: systemVerilogSource


files_lint_verilator:
files:
- lint/verilator_waiver.vlt: {file_type: vlt}

parameters:
# The tracer uses the RISC-V Formal Interface (RVFI) to collect trace signals.
RVFI:
Expand Down Expand Up @@ -100,19 +95,15 @@ parameters:
description: "Number of PMP regions"

targets:
default:
default: &default_target
filesets:
- files_rtl
parameters:
- RVFI=true
toplevel: ibex_core_tracing

lint:
filesets:
# Note on Verilator waivers:
# You *must* include the waiver file first, otherwise only global waivers
# are applied, but not file-specific waivers.
- tool_verilator ? (files_lint_verilator)
- files_rtl
<<: *default_target
parameters:
- RVFI=true
- SYNTHESIS=true
Expand All @@ -127,7 +118,6 @@ targets:
- PMPGranularity
- PMPNumRegions
default_tool: verilator
toplevel: ibex_core_tracing
tools:
verilator:
mode: lint-only
Expand All @@ -136,10 +126,6 @@ targets:
# RAM primitives wider than 64bit (required for ECC) fail to build in
# Verilator without increasing the unroll count (see Verilator#1266)
- "--unroll-count 72"
veriblelint:
ruleset: default
rules:
- "-parameter-name-style"
format:
filesets:
- files_rtl
Expand Down

0 comments on commit 3bc1054

Please sign in to comment.