Skip to content

Commit 8d22fe2

Browse files
authored
Merge pull request #341 from riscv-software-src/332-create-better-profile-comparisons
332 create better profile comparisons
2 parents bc5ec90 + afcc7f8 commit 8d22fe2

File tree

26 files changed

+303
-162
lines changed

26 files changed

+303
-162
lines changed

Rakefile

Lines changed: 53 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -338,45 +338,57 @@ namespace :test do
338338
end
339339
end
340340

341-
namespace :gen do
342-
desc <<~DESC
343-
Generate all certificates and profile PDFs.
344-
DESC
345-
task :cert_profile_pdfs do
346-
puts "==================================="
347-
puts "cert_profile_pdfs: Generating MC100"
348-
puts " 1st target"
349-
puts "==================================="
350-
Rake::Task["#{$root}/gen/certificate_doc/pdf/MC100.pdf"].invoke
351-
352-
puts "=================================================="
353-
puts "cert_profile_pdfs: Generating MockCertificateModel"
354-
puts " 2nd target"
355-
puts "=================================================="
356-
Rake::Task["#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"].invoke
357-
358-
puts "==================================="
359-
puts "cert_profile_pdfs: Generating RVA20"
360-
puts " 3rd target"
361-
puts "==================================="
362-
Rake::Task["#{$root}/gen/profile_doc/pdf/RVA20.pdf"].invoke
363-
364-
puts "==================================="
365-
puts "cert_profile_pdfs: Generating RVA22"
366-
puts " 4th target"
367-
puts "==================================="
368-
Rake::Task["#{$root}/gen/profile_doc/pdf/RVA22.pdf"].invoke
369-
370-
puts "==================================="
371-
puts "cert_profile_pdfs: Generating RVI20"
372-
puts " 5th target"
373-
puts "==================================="
374-
Rake::Task["#{$root}/gen/profile_doc/pdf/RVI20.pdf"].invoke
375-
376-
puts "==================================="
377-
puts "cert_profile_pdfs: Generating MockProfileRelease"
378-
puts " 6th target"
379-
puts "==================================="
380-
Rake::Task["#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"].invoke
381-
end
341+
desc <<~DESC
342+
Generate all portfolio-based PDFs (certificates and profiles).
343+
DESC
344+
task :portfolio_pdfs do
345+
puts ""
346+
puts "==================================="
347+
puts "Generating MC100"
348+
puts "==================================="
349+
puts ""
350+
Rake::Task["#{$root}/gen/certificate_doc/pdf/MC100.pdf"].invoke
351+
352+
puts ""
353+
puts "=================================================="
354+
puts "Generating MockCertificateModel"
355+
puts "=================================================="
356+
puts ""
357+
Rake::Task["#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"].invoke
358+
359+
puts ""
360+
puts "==================================="
361+
puts "Generating RVA20"
362+
puts "==================================="
363+
puts ""
364+
Rake::Task["#{$root}/gen/profile_doc/pdf/RVA20.pdf"].invoke
365+
366+
puts ""
367+
puts "==================================="
368+
puts "Generating RVA22"
369+
puts "==================================="
370+
puts ""
371+
Rake::Task["#{$root}/gen/profile_doc/pdf/RVA22.pdf"].invoke
372+
373+
puts ""
374+
puts "==================================="
375+
puts "Generating RVI20"
376+
puts "==================================="
377+
puts ""
378+
Rake::Task["#{$root}/gen/profile_doc/pdf/RVI20.pdf"].invoke
379+
380+
puts ""
381+
puts "==================================="
382+
puts "Generating MockProfileRelease"
383+
puts "==================================="
384+
puts ""
385+
Rake::Task["#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"].invoke
382386
end
387+
388+
# Shortcut targets for building profiles and certificates.
389+
task MC100: "#{$root}/gen/certificate_doc/pdf/MC100.pdf"
390+
task MockCertificateModel: "#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"
391+
task RVI20: "#{$root}/gen/profile_doc/pdf/RVI20.pdf"
392+
task RVA20: "#{$root}/gen/profile_doc/pdf/RVA20.pdf"
393+
task RVA22: "#{$root}/gen/profile_doc/pdf/RVA22.pdf"
394+
task MockProfileRelease: "#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"

arch/csr/menvcfg.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ name: menvcfg
66
address: 0x30A
77
long_name: Machine Environment Configuration
88
description: |
9-
Contains bits to enable/disable extensions
9+
Contains fields that control certain characteristics of the execution environment
10+
for modes less privileged than M-mode.
1011
1112
The `menvcfg` CSR controls
1213
certain characteristics of the execution environment for modes less

arch/csr/senvcfg.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ kind: csr
55
name: senvcfg
66
address: 0x10A
77
long_name: Supervisor Environment Configuration
8-
description: Contains bits to enable/disable extensions
8+
description: |
9+
Contains fields that control certain characteristics of the U-mode execution environment.
910
priv_mode: S
1011
length: 64
1112
definedBy:
1213
allOf:
13-
- name: Sm
14-
version: ">=1.12"
1514
- name: S
15+
version: ">=1.12"
16+
- name: U
1617
fields:
1718
CBZE:
1819
location: 7

arch/ext/S.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,18 @@ name: S
66
type: privileged
77
long_name: Supervisor mode
88
versions:
9-
- version: "1.12.0"
10-
state: ratified
11-
ratification_date: 2021-12
12-
requires:
13-
name: U
14-
version: "= 1.12.0"
9+
- version: "1.11.0"
10+
state: ratified
11+
ratification_date: 2019-06
12+
requires:
13+
name: U
14+
version: "= 1.0.0"
15+
- version: "1.12.0"
16+
state: ratified
17+
ratification_date: 2021-12
18+
requires:
19+
name: U
20+
version: "= 1.0.0"
1521
description: |
1622
This chapter describes the RISC-V supervisor-level architecture, which
1723
contains a common core that is used with various supervisor-level

arch/ext/Sm.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@ params:
460460
schema:
461461
type: string
462462
enum: [little, big, dynamic]
463+
# TODO: Only little available in Sm 1.11
463464
MISA_CSR_IMPLEMENTED:
464465
description: |
465466
Whether or not the `misa` CSR returns zero or a non-zero value.

arch/ext/Sstc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
$schema: "ext_schema.json#"
44
kind: extension
55
name: Sstc
6-
long_name: Superivisor mode timer interrupts
7-
description: Superivisor mode timer interrupts
6+
long_name: Supervisor-mode timer interrupts
7+
description: Supervisor-mode timer interrupts
88
type: privileged
99
versions:
1010
- version: "0.9.0"

arch/ext/Sv32.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ type: privileged
99
versions:
1010
- version: "1.12.0"
1111
state: ratified
12-
ratification_date: unknown
12+
ratification_date: null
1313
url: https://github.com/riscv/riscv-isa-manual/releases/download/Priv-v1.12/riscv-privileged-20211203.pdf

arch/ext/Sv39.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ type: privileged
99
versions:
1010
- version: "1.12.0"
1111
state: ratified
12-
ratification_date: unknown
12+
ratification_date: null
1313
url: https://github.com/riscv/riscv-isa-manual/releases/download/Priv-v1.12/riscv-privileged-20211203.pdf

arch/ext/Sv48.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ type: privileged
99
versions:
1010
- version: "1.12.0"
1111
state: ratified
12-
ratification_date: unknown
12+
ratification_date: null
1313
url: https://github.com/riscv/riscv-isa-manual/releases/download/Priv-v1.12/riscv-privileged-20211203.pdf
1414
requires:
1515
name: Sv39

arch/ext/Sv57.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ type: privileged
99
versions:
1010
- version: "1.12.0"
1111
state: ratified
12-
ratification_date: unknown
12+
ratification_date: null
1313
url: https://github.com/riscv/riscv-isa-manual/releases/download/Priv-v1.12/riscv-privileged-20211203.pdf
1414
requires:
1515
name: Sv48

0 commit comments

Comments
 (0)