Skip to content

Commit 3f3bcbd

Browse files
Renaming certificate to CRD in the backend. Also added proc_ prefix to frontend /arch files. And, also igore *.bak files in Git.
1 parent 57d5f08 commit 3f3bcbd

30 files changed

+296
-293
lines changed

.github/workflows/pages.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,21 @@ jobs:
7676
- name: Copy RVI20 Profile Release PDF
7777
run: cp gen/profile_doc/pdf/RVA20.pdf _site/pdfs/RVI20.pdf
7878
- name: Create MC100-32 PDF Spec
79-
run: ./do gen:cert_model_pdf[MC100-32]
79+
run: ./do gen:proc_cert_model_pdf[MC100-32]
8080
- name: Copy MC100-32 PDF
81-
run: cp gen/certificate_doc/pdf/MC100-32.pdf _site/pdfs/MC100-32.pdf
81+
run: cp gen/crd/pdf/MC100-32.pdf _site/pdfs/MC100-32.pdf
8282
- name: Create MC100-32 HTML Spec
83-
run: ./do gen:cert_model_html[MC100-32]
83+
run: ./do gen:proc_cert_model_html[MC100-32]
8484
- name: Copy MC100-32 HTML
85-
run: cp gen/certificate_doc/html/MC100-32.html _site/htmls/MC100-32.html
85+
run: cp gen/crd/html/MC100-32.html _site/htmls/MC100-32.html
8686
- name: Create MC100-64 PDF Spec
87-
run: ./do gen:cert_model_pdf[MC100-64]
87+
run: ./do gen:proc_cert_model_pdf[MC100-64]
8888
- name: Copy MC100-64 PDF
89-
run: cp gen/certificate_doc/pdf/MC100-64.pdf _site/pdfs/MC100-64.pdf
89+
run: cp gen/crd/pdf/MC100-64.pdf _site/pdfs/MC100-64.pdf
9090
- name: Create MC100-64 HTML Spec
91-
run: ./do gen:cert_model_html[MC100-64]
91+
run: ./do gen:proc_cert_model_html[MC100-64]
9292
- name: Copy MC100-64 HTML
93-
un: cp gen/certificate_doc/html/MC100-64.html _site/htmls/MC100-64.html
93+
un: cp gen/crd/html/MC100-64.html _site/htmls/MC100-64.html
9494
- name: Copy manual html
9595
run: cp -R gen/manual/isa/top/all/html _site/manual
9696
- 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:cert_model_pdf[MockCertificateModel]
134+
run: ./do gen:proc_cert_model_pdf[MockProcCertModel]
135135
regress-gen-profile:
136136
runs-on: ubuntu-latest
137137
needs: regress-smoke

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ resolved_arch
1515
node_modules
1616
_site
1717
images
18+
*.bak
1819
*.log

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ repos:
4646
args: ["--schemafile", "schemas/ext_schema.json"]
4747
- id: check-jsonschema
4848
alias: check-jsonschema-cert-model
49-
files: ^arch/certificate_model/.*\.(yaml|yml)$
50-
args: ["--schemafile", "schemas/cert_model_schema.json"]
49+
files: ^arch/proc_cert_model/.*\.(yaml|yml)$
50+
args: ["--schemafile", "schemas/proc_cert_model_schema.json"]
5151
- id: check-jsonschema
5252
alias: check-jsonschema-cert-class
53-
files: ^arch/certificate_class/.*\.(yaml|yml)$
54-
args: ["--schemafile", "schemas/cert_class_schema.json"]
53+
files: ^arch/proc_cert_class/.*\.(yaml|yml)$
54+
args: ["--schemafile", "schemas/proc_cert_class_schema.json"]
5555
# Commenting because throwing errors and not sure this is complete yet
5656
# - id: check-jsonschema
5757
# alias: check-jsonschema-manual-version

.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"name": "MC100-32",
77
"request": "launch",
88
"command": "bundle exec rake",
9-
"script": "gen:cert_model_pdf[MC100-32]",
9+
"script": "gen:proc_cert_model_pdf[MC100-32]",
1010
"args": [],
1111
"askParameters": false
1212
},
@@ -15,7 +15,7 @@
1515
"name": "MC200-32",
1616
"request": "launch",
1717
"command": "bundle exec rake",
18-
"script": "gen:cert_model_pdf[MC200-32]",
18+
"script": "gen:proc_cert_model_pdf[MC200-32]",
1919
"args": [],
2020
"askParameters": false
2121
},

Rakefile

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def arch_for(base_isa_name, base)
3838
)
3939
end
4040

41-
# @param design_name [String] Profile release name for profiles and certificate model name for certificates
41+
# @param design_name [String] Profile release name for profiles and processor certificate model name for certificates
4242
# @param arch [Architecture] The architecture database
4343
# @param base [Integer] 32 or 64
4444
# @param portfolios [Array<Portfolio>] Portfolios in this design
@@ -357,7 +357,7 @@ namespace :test do
357357

358358
Rake::Task["gen:html"].invoke("generic_rv64")
359359

360-
Rake::Task["#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"].invoke
360+
Rake::Task["#{$root}/gen/crd/pdf/MockProcCertModel.pdf"].invoke
361361
Rake::Task["#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"].invoke
362362

363363
puts
@@ -381,31 +381,31 @@ desc <<~DESC
381381
Generate all portfolio-based PDF artifacts (certificates and profiles)
382382
DESC
383383
task :portfolios do
384-
portfolio_start_msg("MockCertificateModel")
385-
Rake::Task["#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"].invoke
386-
portfolio_start_msg("MockProfileRelease")
384+
portfolio_start_msg("MockProcCertModel CRD")
385+
Rake::Task["#{$root}/gen/crd/pdf/MockProcCertModel.pdf"].invoke
386+
portfolio_start_msg("MockProfileRelease CRD")
387387
Rake::Task["#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"].invoke
388-
portfolio_start_msg("MC100-32")
389-
Rake::Task["#{$root}/gen/certificate_doc/pdf/MC100-32.pdf"].invoke
390-
portfolio_start_msg("MC100-64")
391-
Rake::Task["#{$root}/gen/certificate_doc/pdf/MC100-64.pdf"].invoke
392-
portfolio_start_msg("MC200-32")
393-
Rake::Task["#{$root}/gen/certificate_doc/pdf/MC200-32.pdf"].invoke
394-
portfolio_start_msg("MC200-64")
395-
Rake::Task["#{$root}/gen/certificate_doc/pdf/MC200-64.pdf"].invoke
396-
portfolio_start_msg("MC300-32")
397-
Rake::Task["#{$root}/gen/certificate_doc/pdf/MC300-32.pdf"].invoke
398-
portfolio_start_msg("MC300-64")
399-
Rake::Task["#{$root}/gen/certificate_doc/pdf/MC300-64.pdf"].invoke
400-
portfolio_start_msg("RVI20")
388+
portfolio_start_msg("MC100-32 CRD")
389+
Rake::Task["#{$root}/gen/crd/pdf/MC100-32.pdf"].invoke
390+
portfolio_start_msg("MC100-64 CRD")
391+
Rake::Task["#{$root}/gen/crd/pdf/MC100-64.pdf"].invoke
392+
portfolio_start_msg("MC200-32 CRD")
393+
Rake::Task["#{$root}/gen/crd/pdf/MC200-32.pdf"].invoke
394+
portfolio_start_msg("MC200-64 CRD")
395+
Rake::Task["#{$root}/gen/crd/pdf/MC200-64.pdf"].invoke
396+
portfolio_start_msg("MC300-32 CRD")
397+
Rake::Task["#{$root}/gen/crd/pdf/MC300-32.pdf"].invoke
398+
portfolio_start_msg("MC300-64 CRD")
399+
Rake::Task["#{$root}/gen/crd/pdf/MC300-64.pdf"].invoke
400+
portfolio_start_msg("RVI20 Profile Release")
401401
Rake::Task["#{$root}/gen/profile_doc/pdf/RVI20.pdf"].invoke
402-
portfolio_start_msg("RVA20")
402+
portfolio_start_msg("RVA20 Profile Release")
403403
Rake::Task["#{$root}/gen/profile_doc/pdf/RVA20.pdf"].invoke
404-
portfolio_start_msg("RVA22")
404+
portfolio_start_msg("RVA22 Profile Release")
405405
Rake::Task["#{$root}/gen/profile_doc/pdf/RVA22.pdf"].invoke
406-
portfolio_start_msg("RVA23")
406+
portfolio_start_msg("RVA23 Profile Release")
407407
Rake::Task["#{$root}/gen/profile_doc/pdf/RVA23.pdf"].invoke
408-
portfolio_start_msg("RVB23")
408+
portfolio_start_msg("RVB23 Profile Release")
409409
Rake::Task["#{$root}/gen/profile_doc/pdf/RVB23.pdf"].invoke
410410
end
411411

@@ -418,13 +418,13 @@ def portfolio_start_msg(name)
418418
end
419419

420420
# Shortcut targets for building profiles and certificates.
421-
task "MockCertificateModel": "#{$root}/gen/certificate_doc/pdf/MockCertificateModel.pdf"
422-
task "MC100-32": "#{$root}/gen/certificate_doc/pdf/MC100-32.pdf"
423-
task "MC100-64": "#{$root}/gen/certificate_doc/pdf/MC100-64.pdf"
424-
task "MC200-32": "#{$root}/gen/certificate_doc/pdf/MC200-32.pdf"
425-
task "MC200-64": "#{$root}/gen/certificate_doc/pdf/MC200-64.pdf"
426-
task "MC300-32": "#{$root}/gen/certificate_doc/pdf/MC300-32.pdf"
427-
task "MC300-64": "#{$root}/gen/certificate_doc/pdf/MC300-64.pdf"
421+
task "MockProcCertModel": "#{$root}/gen/crd/pdf/MockProcCertModel.pdf"
422+
task "MC100-32": "#{$root}/gen/crd/pdf/MC100-32.pdf"
423+
task "MC100-64": "#{$root}/gen/crd/pdf/MC100-64.pdf"
424+
task "MC200-32": "#{$root}/gen/crd/pdf/MC200-32.pdf"
425+
task "MC200-64": "#{$root}/gen/crd/pdf/MC200-64.pdf"
426+
task "MC300-32": "#{$root}/gen/crd/pdf/MC300-32.pdf"
427+
task "MC300-64": "#{$root}/gen/crd/pdf/MC300-64.pdf"
428428
task "MockProfileRelease": "#{$root}/gen/profile_doc/pdf/MockProfileRelease.pdf"
429429
task "RVI20": "#{$root}/gen/profile_doc/pdf/RVI20.pdf"
430430
task "RVA20": "#{$root}/gen/profile_doc/pdf/RVA20.pdf"

arch/certificate_class/MC.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

arch/certificate_class/MockCertificateClass.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

arch/certificate_model/MC100-64.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

arch/certificate_model/MC200-64.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)