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

Fix pre-commit issues with layout files, fix do with devcontainer #364

Merged
merged 1 commit into from
Dec 18, 2024
+96 −40
Merged

Fix pre-commit issues with layout files, fix do with devcontainer #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions arch/csr/Zihpm/mhpmcounterNh.layout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ fields:
alias: mhpmcounter.COUNT<%= hpm_num %>[63:32]
description: |
Upper bits of counter.
type(): 'return (HPM_COUNTER_EN[<%= hpm_num %>]) ? CsrFieldType::RWH : CsrFieldType::RO;'
reset_value(): 'return (HPM_COUNTER_EN[<%= hpm_num %>]) ? UNDEFINED_LEGAL : 0;'
type(): "return (HPM_COUNTER_EN[<%= hpm_num %>]) ? CsrFieldType::RWH : CsrFieldType::RO;"
reset_value(): "return (HPM_COUNTER_EN[<%= hpm_num %>]) ? UNDEFINED_LEGAL : 0;"
sw_read(): |
if (HPM_COUNTER_EN[<%= hpm_num %>]) {
return read_hpm_counter(<%= hpm_num %>)[63:32];
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent14.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent15.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent16.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent17.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent18.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent19.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent20.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent21.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent22.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent23.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent24.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent25.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent26.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent27.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent28.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent29.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent30.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent31.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
4 changes: 3 additions & 1 deletion arch/csr/Zihpm/mhpmevent9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json
# yaml-language-server: $schema=../../../schemas/csr_schema.json

# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout

$schema: csr_schema.json#
kind: csr
Expand Down
1 change: 0 additions & 1 deletion arch/csr/Zihpm/mhpmeventN.layout
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# yaml-language-server: $schema=../../../schemas/csr_schema.json

<%- raise "'hpm_num' must be defined" if hpm_num.nil? -%>
Expand Down
15 changes: 7 additions & 8 deletions do
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
#!/bin/bash

ROOT=$(dirname $(realpath $BASH_SOURCE[0]))
if [ -v DEVCONTAINER_ENV ]; then
BUNDLE=bundle
else
source $ROOT/bin/setup
fi

if [ "$1" == "clean" ]; then
${ROOT}/bin/clean
else
# really long way of invoking rake, but renamed to 'do'
$BUNDLE exec --gemfile $ROOT/Gemfile ruby -r rake -e "Rake.application.init('do');Rake.application.load_rakefile;Rake.application.top_level" -- $@
exit $?
fi

source $ROOT/bin/setup


# really long way of invoking rake, but renamed to 'do'
$BUNDLE exec --gemfile $ROOT/Gemfile ruby -r rake -e "Rake.application.init('do');Rake.application.load_rakefile;Rake.application.top_level" -- $@
Loading