Skip to content

Commit 7f529c3

Browse files
james-ball-qualcommjames-ball-qualcomm
committed
Portfolio name changes in preparation for CTP.
1 parent b9aa16d commit 7f529c3

File tree

13 files changed

+125
-102
lines changed

13 files changed

+125
-102
lines changed

‎.github/workflows/pages.yml‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,35 +62,31 @@ jobs:
6262
- name: Create RVA20 Profile Release PDF Spec
6363
run: ./do gen:profile_release_pdf[RVA20]
6464
- name: Copy RVA20 Profile Release PDF
65-
run: cp gen/profile/pdf/RVA20.pdf _site/pdfs/RVA20.pdf
65+
run: cp gen/profile/pdf/RVA20ProfileRelease.pdf _site/pdfs
6666
- name: Create RVA22 Profile Release PDF Spec
6767
run: ./do gen:profile_release_pdf[RVA22]
6868
- name: Copy RVA22 Profile Release PDF
69-
run: cp gen/profile/pdf/RVA22.pdf _site/pdfs/RVA22.pdf
69+
run: cp gen/profile/pdf/RVA22ProfileRelease.pdf _site/pdfs
70+
- name: Create RVA23 Profile Release PDF Spec
71+
run: ./do gen:profile_release_pdf[RVA23]
7072
- name: Copy RVA23 Profile Release PDF
71-
run: cp gen/profile/pdf/RVA23.pdf _site/pdfs/RVA23.pdf
73+
run: cp gen/profile/pdf/RVA23ProfileRelease.pdf _site/pdfs
74+
- name: Create RVB23 Profile Release PDF Spec
75+
run: ./do gen:profile_release_pdf[RVB23]
7276
- name: Copy RVB23 Profile Release PDF
73-
run: cp gen/profile/pdf/RVB23.pdf _site/pdfs/RVB23.pdf
77+
run: cp gen/profile/pdf/RVB23ProfileRelease.pdf _site/pdfs
7478
- name: Create RVI20 Profile Release PDF Spec
7579
run: ./do gen:profile_release_pdf[RVI20]
7680
- name: Copy RVI20 Profile Release PDF
77-
run: cp gen/profile/pdf/RVA20.pdf _site/pdfs/RVI20.pdf
78-
- name: Create MC100-32 PDF Spec
81+
run: cp gen/profile/pdf/RVA20ProfileRelease.pdf _site/pdfs
82+
- name: Create MC100-32-CRD PDF Spec
7983
run: ./do gen:proc_crd_pdf[MC100-32]
80-
- name: Copy MC100-32 PDF
81-
run: cp gen/crd/pdf/MC100-32.pdf _site/pdfs/MC100-32.pdf
82-
- name: Create MC100-32 HTML Spec
83-
run: ./do gen:proc_crd_html[MC100-32]
84-
- name: Copy MC100-32 HTML
85-
run: cp gen/crd/html/MC100-32.html _site/htmls/MC100-32.html
86-
- name: Create MC100-64 PDF Spec
84+
- name: Copy MC100-32-CRD PDF
85+
run: cp gen/crd/pdf/MC100-32-CRD.pdf _site/pdfs
86+
- name: Create MC100-64-CRD PDF Spec
8787
run: ./do gen:proc_crd_pdf[MC100-64]
88-
- name: Copy MC100-64 PDF
89-
run: cp gen/crd/pdf/MC100-64.pdf _site/pdfs/MC100-64.pdf
90-
- name: Create MC100-64 HTML Spec
91-
run: ./do gen:proc_crd_html[MC100-64]
92-
- name: Copy MC100-64 HTML
93-
un: cp gen/crd/html/MC100-64.html _site/htmls/MC100-64.html
88+
- name: Copy MC100-64-CRD PDF
89+
run: cp gen/crd/pdf/MC100-64-CRD.pdf _site/pdfs
9490
- name: Copy manual html
9591
run: cp -R gen/manual/isa/top/all/html _site/manual
9692
- name: Setup Pages

‎.github/workflows/regress.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
name: Build container
132132
run: ./bin/build_container
133133
- name: Generate extension PDF
134-
run: ./do gen:proc_crd_pdf[MockProcCertModel]
134+
run: ./do gen:proc_crd_pdf[MockProcessor]
135135
regress-gen-profile:
136136
runs-on: ubuntu-latest
137137
needs: regress-smoke

‎.vscode/launch.json‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"configurations": [
44
{
55
"type": "rdbg",
6-
"name": "MC100-32",
6+
"name": "MC100-32-CRD",
77
"request": "launch",
88
"command": "bundle exec rake",
99
"script": "gen:proc_crd_pdf[MC100-32]",
@@ -12,13 +12,22 @@
1212
},
1313
{
1414
"type": "rdbg",
15-
"name": "MC200-32",
15+
"name": "MC200-32-CRD",
1616
"request": "launch",
1717
"command": "bundle exec rake",
1818
"script": "gen:proc_crd_pdf[MC200-32]",
1919
"args": [],
2020
"askParameters": false
2121
},
22+
{
23+
"type": "rdbg",
24+
"name": "MockCRD",
25+
"request": "launch",
26+
"command": "bundle exec rake",
27+
"script": "gen:proc_crd_pdf[MockProcessor]",
28+
"args": [],
29+
"askParameters": false
30+
},
2231
{
2332
"type": "rdbg",
2433
"name": "portfolios",
@@ -28,6 +37,15 @@
2837
"args": [],
2938
"askParameters": false
3039
},
40+
{
41+
"type": "rdbg",
42+
"name": "MockProfile",
43+
"request": "launch",
44+
"command": "bundle exec rake",
45+
"script": "gen:profile_release_pdf[Mock]",
46+
"args": [],
47+
"askParameters": false
48+
},
3149
{
3250
"type": "rdbg",
3351
"name": "RVA20",

‎Rakefile‎

Lines changed: 51 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ namespace :test do
122122
end
123123
task schema: "gen:resolved_arch" do
124124
puts "Checking arch files against schema.."
125-
Architecture.new("rv64", "#{$root}/resolved_arch").validate(show_progress: true)
125+
Architecture.new("RISC-V Architecture", "#{$root}/resolved_arch").validate(show_progress: true)
126126
puts "All files validate against their schema"
127127
end
128128
task idl: ["gen:resolved_arch", "#{$root}/.stamps/resolve-rv32.stamp", "#{$root}/.stamps/resolve-rv64.stamp"] do
@@ -328,8 +328,11 @@ namespace :test do
328328
puts "UPDATE: Running gen:html for generic_rv64"
329329
Rake::Task["gen:html"].invoke("generic_rv64")
330330

331-
puts "UPDATE: Generating MockProcCertModel.pdf"
332-
Rake::Task["#{$root}/gen/crd/pdf/MockProcCertModel.pdf"].invoke
331+
puts "UPDATE: Generating MockProcessor-CRD.pdf"
332+
Rake::Task["#{$root}/gen/crd/pdf/MockProcessor-CRD.pdf"].invoke
333+
334+
#puts "UPDATE: Generating MockProcessor-CTP.pdf"
335+
#Rake::Task["#{$root}/gen/ctp/pdf/MockProcessor-CTP.pdf"].invoke
333336

334337
puts "UPDATE: Generating MockProfileRelease.pdf"
335338
Rake::Task["#{$root}/gen/profile/pdf/MockProfileRelease.pdf"].invoke
@@ -355,32 +358,36 @@ desc <<~DESC
355358
Generate all portfolio-based PDF artifacts (certificates and profiles)
356359
DESC
357360
task :portfolios do
358-
portfolio_start_msg("MockProcCertModel CRD")
359-
Rake::Task["#{$root}/gen/crd/pdf/MockProcCertModel.pdf"].invoke
360-
portfolio_start_msg("MockProfileRelease CRD")
361+
portfolio_start_msg("MockProcessor-CRD")
362+
Rake::Task["#{$root}/gen/crd/pdf/MockProcessor-CRD.pdf"].invoke
363+
#portfolio_start_msg("MockProcessor-CTP")
364+
#Rake::Task["#{$root}/gen/ctp/pdf/MockProcessor-CTP.pdf"].invoke
365+
portfolio_start_msg("MockProfileRelease")
361366
Rake::Task["#{$root}/gen/profile/pdf/MockProfileRelease.pdf"].invoke
362-
portfolio_start_msg("MC100-32 CRD")
363-
Rake::Task["#{$root}/gen/crd/pdf/MC100-32.pdf"].invoke
364-
portfolio_start_msg("MC100-64 CRD")
365-
Rake::Task["#{$root}/gen/crd/pdf/MC100-64.pdf"].invoke
366-
portfolio_start_msg("MC200-32 CRD")
367-
Rake::Task["#{$root}/gen/crd/pdf/MC200-32.pdf"].invoke
368-
portfolio_start_msg("MC200-64 CRD")
369-
Rake::Task["#{$root}/gen/crd/pdf/MC200-64.pdf"].invoke
370-
portfolio_start_msg("MC300-32 CRD")
371-
Rake::Task["#{$root}/gen/crd/pdf/MC300-32.pdf"].invoke
372-
portfolio_start_msg("MC300-64 CRD")
373-
Rake::Task["#{$root}/gen/crd/pdf/MC300-64.pdf"].invoke
374-
portfolio_start_msg("RVI20 Profile Release")
375-
Rake::Task["#{$root}/gen/profile/pdf/RVI20.pdf"].invoke
376-
portfolio_start_msg("RVA20 Profile Release")
377-
Rake::Task["#{$root}/gen/profile/pdf/RVA20.pdf"].invoke
378-
portfolio_start_msg("RVA22 Profile Release")
379-
Rake::Task["#{$root}/gen/profile/pdf/RVA22.pdf"].invoke
380-
portfolio_start_msg("RVA23 Profile Release")
381-
Rake::Task["#{$root}/gen/profile/pdf/RVA23.pdf"].invoke
382-
portfolio_start_msg("RVB23 Profile Release")
383-
Rake::Task["#{$root}/gen/profile/pdf/RVB23.pdf"].invoke
367+
#portfolio_start_msg("MC100-32-CTP")
368+
#Rake::Task["#{$root}/gen/ctp/pdf/MC100-32-CTP.pdf"].invoke
369+
portfolio_start_msg("MC100-32-CRD")
370+
Rake::Task["#{$root}/gen/crd/pdf/MC100-32-CRD.pdf"].invoke
371+
portfolio_start_msg("MC100-64-CRD")
372+
Rake::Task["#{$root}/gen/crd/pdf/MC100-64-CRD.pdf"].invoke
373+
portfolio_start_msg("MC200-32-CRD")
374+
Rake::Task["#{$root}/gen/crd/pdf/MC200-32-CRD.pdf"].invoke
375+
portfolio_start_msg("MC200-64-CRD")
376+
Rake::Task["#{$root}/gen/crd/pdf/MC200-64-CRD.pdf"].invoke
377+
portfolio_start_msg("MC300-32-CRD")
378+
Rake::Task["#{$root}/gen/crd/pdf/MC300-32-CRD.pdf"].invoke
379+
portfolio_start_msg("MC300-64-CRD")
380+
Rake::Task["#{$root}/gen/crd/pdf/MC300-64-CRD.pdf"].invoke
381+
portfolio_start_msg("RVI20ProfileRelease")
382+
Rake::Task["#{$root}/gen/profile/pdf/RVI20ProfileRelease.pdf"].invoke
383+
portfolio_start_msg("RVA20ProfileRelease")
384+
Rake::Task["#{$root}/gen/profile/pdf/RVA20ProfileRelease.pdf"].invoke
385+
portfolio_start_msg("RVA22ProfileRelease")
386+
Rake::Task["#{$root}/gen/profile/pdf/RVA22ProfileRelease.pdf"].invoke
387+
portfolio_start_msg("RVA23ProfileRelease")
388+
Rake::Task["#{$root}/gen/profile/pdf/RVA23ProfileRelease.pdf"].invoke
389+
portfolio_start_msg("RVB23ProfileRelease")
390+
Rake::Task["#{$root}/gen/profile/pdf/RVB23ProfileRelease.pdf"].invoke
384391
end
385392

386393
def portfolio_start_msg(name)
@@ -391,17 +398,19 @@ def portfolio_start_msg(name)
391398
puts ""
392399
end
393400

394-
# Shortcut targets for building profiles and certificates.
395-
task "MockProcCertModel": "#{$root}/gen/crd/pdf/MockProcCertModel.pdf"
396-
task "MC100-32": "#{$root}/gen/crd/pdf/MC100-32.pdf"
397-
task "MC100-64": "#{$root}/gen/crd/pdf/MC100-64.pdf"
398-
task "MC200-32": "#{$root}/gen/crd/pdf/MC200-32.pdf"
399-
task "MC200-64": "#{$root}/gen/crd/pdf/MC200-64.pdf"
400-
task "MC300-32": "#{$root}/gen/crd/pdf/MC300-32.pdf"
401-
task "MC300-64": "#{$root}/gen/crd/pdf/MC300-64.pdf"
402-
task "MockProfileRelease": "#{$root}/gen/profile/pdf/MockProfileRelease.pdf"
403-
task "RVI20": "#{$root}/gen/profile/pdf/RVI20.pdf"
404-
task "RVA20": "#{$root}/gen/profile/pdf/RVA20.pdf"
405-
task "RVA22": "#{$root}/gen/profile/pdf/RVA22.pdf"
406-
task "RVA23": "#{$root}/gen/profile/pdf/RVA23.pdf"
407-
task "RVB23": "#{$root}/gen/profile/pdf/RVB23.pdf"
401+
# Shortcut targets for building CRDs, CTPs, and Profile Releases.
402+
task "MockCRD": "#{$root}/gen/crd/pdf/MockProcessor-CRD.pdf"
403+
#task "MockCTP": "#{$root}/gen/ctp/pdf/MockProcessor-CTP.pdf"
404+
#task "MC100-32-CTP": "#{$root}/gen/ctp/pdf/MC100-32-CTP.pdf"
405+
task "MC100-32-CRD": "#{$root}/gen/crd/pdf/MC100-32-CRD.pdf"
406+
task "MC100-64-CRD": "#{$root}/gen/crd/pdf/MC100-64-CRD.pdf"
407+
task "MC200-32-CRD": "#{$root}/gen/crd/pdf/MC200-32-CRD.pdf"
408+
task "MC200-64-CRD": "#{$root}/gen/crd/pdf/MC200-64-CRD.pdf"
409+
task "MC300-32-CRD": "#{$root}/gen/crd/pdf/MC300-32-CRD.pdf"
410+
task "MC300-64-CRD": "#{$root}/gen/crd/pdf/MC300-64-CRD.pdf"
411+
task "MockProfile": "#{$root}/gen/profile/pdf/MockProfileRelease.pdf"
412+
task "RVI20": "#{$root}/gen/profile/pdf/RVI20ProfileRelease.pdf"
413+
task "RVA20": "#{$root}/gen/profile/pdf/RVA20ProfileRelease.pdf"
414+
task "RVA22": "#{$root}/gen/profile/pdf/RVA22ProfileRelease.pdf"
415+
task "RVA23": "#{$root}/gen/profile/pdf/RVA23ProfileRelease.pdf"
416+
task "RVB23": "#{$root}/gen/profile/pdf/RVB23ProfileRelease.pdf"

arch/proc_cert_class/MockProcCertClass.yaml renamed to arch/proc_cert_class/MockProcessor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
$schema: proc_cert_class_schema.json#
44
kind: Processor Certificate Class
55
processor_kind: Apps Processor
6-
name: MockProcCertClass
6+
name: MockProcessor
77
long_name: Mock Processor Certificate Class Long Name
88

99
introduction: |

arch/proc_cert_model/MockProcCertModel.yaml renamed to arch/proc_cert_model/MockProcessor.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
$schema: proc_cert_model_schema.json#
44
kind: Processor Certificate Model
5-
name: MockProcCertModel
5+
name: MockProcessor
66
long_name: Mock Processor Certificate Model Long Name
77
class:
8-
$ref: proc_cert_class/MockProcCertClass.yaml#
8+
$ref: proc_cert_class/MockProcessor.yaml#
99

1010
# XLEN used by rakefile
1111
base: 64

‎arch/profile/MP-S-64.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ marketing_name: MockProfile 64-bit S-mode
77
description: This is the Mock Profile Supervisor Mode description.
88
mode: S
99
base: 64
10-
release: { $ref: profile_release/MockProfileRelease.yaml# }
10+
release: { $ref: profile_release/Mock.yaml# }
1111
contributors:
1212
- name: Micky Mouse
1313
email: [email protected]

‎arch/profile/MP-U-64.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: MP-U-64
44
marketing_name: MockProfile 64-bit Unpriv
55
mode: Unpriv
66
base: 64
7-
release: { $ref: profile_release/MockProfileRelease.yaml# }
7+
release: { $ref: profile_release/Mock.yaml# }
88
extensions:
99
A:
1010
presence: optional

arch/profile_class/MockProfileClass.yaml renamed to arch/profile_class/Mock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$schema: profile_class_schema.json#
22
kind: Profile Class
33
processor_kind: Microcontroller
4-
name: MockProfileClass
4+
name: Mock
55
marketing_name: Mock Profile Class
66
introduction: Here's the Mock Profile Class introduction.
77
description: |

arch/profile_release/MockProfileRelease.yaml renamed to arch/profile_release/Mock.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
$schema: profile_release_schema.json#
22
kind: Profile Release
3-
name: MockProfileRelease
4-
marketing_name: MockProfileRelease Marketing Name
3+
name: Mock
4+
marketing_name: Mock Profile Release Marketing Name
55
class:
6-
$ref: profile_class/MockProfileClass.yaml#
6+
$ref: profile_class/Mock.yaml#
77
release: 20
88
state: ratified # current status ["ratified", "development"]
99
versions:

0 commit comments

Comments
 (0)