Skip to content

Commit d29399e

Browse files
james-ball-qualcommjames-ball-qualcomm
authored
fix: removed test procedures and some lingering coverage_point stuff that I removed (riscv#1436)
Fixes riscv#1432. I had put provisions in UDB to provide information about certification test procedures and coverpoints. This information subsequently was decided by the CSC to put this information outside of UDB in its own repo. So, I'm removing the provisions in UDB to put this information into the ext/inst/CSR YAML files and remove the examples of this information that I put in a few of those YAML files. --------- Signed-off-by: James Ball <jameball@qti.qualcomm.com>
1 parent 99bccdb commit d29399e

20 files changed

Lines changed: 2 additions & 408 deletions

File tree

‎backends/portfolio/templates/csr_appendix.adoc.erb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,11 @@ Location: ::
139139
Type: ::
140140
<%= field.type_pretty %>
141141
142-
<%= portfolio_design.include_erb("test_procedures.adoc.erb", { "db_obj" => csr, "org" => "appendix" }) %>
143142
Reset value: ::
144143
<%= field.reset_value_pretty %>
145144
146145
<% if defined?(gen_ctp_content) && gen_ctp_content -%>
147146
<%= portfolio_design.include_erb("normative_rules.adoc.erb", { "db_obj" => field, "org" => "appendix", "use_description_list" => true }) %>
148-
<%= portfolio_design.include_erb("test_procedures.adoc.erb", { "db_obj" => field, "org" => "appendix", "use_description_list" => true }) %>
149147
<% end # if gen_ctp_content -%>
150148
151149
****

‎backends/portfolio/templates/ext_appendix.adoc.erb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ The following parameters (implementation options) may affect the operation of th
156156
157157
<% if defined?(gen_ctp_content) && gen_ctp_content -%>
158158
<%= portfolio_design.include_erb("normative_rules.adoc.erb", { "db_obj" => ext, "org" => "appendix", "use_description_list" => true}) %>
159-
<%= portfolio_design.include_erb("test_procedures.adoc.erb", { "db_obj" => ext, "org" => "appendix", "use_description_list" => true}) %>
160159
<% end # if gen_ctp_content -%>
161160
162161
<% end # do ext_req -%>

‎backends/portfolio/templates/inst_appendix.adoc.erb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ This instruction may result in the following synchronous exceptions:
173173

174174
<% if defined?(gen_ctp_content) && gen_ctp_content -%>
175175
<%= portfolio_design.include_erb("normative_rules.adoc.erb", { "db_obj" => inst, "org" => "appendix" }) %>
176-
<%= portfolio_design.include_erb("test_procedures.adoc.erb", { "db_obj" => inst, "org" => "appendix" }) %>
177176
<% end # if gen_ctp_content -%>
178177
179178
<% end # each in_scope instruction -%>

‎backends/portfolio/templates/test_procedures.adoc.erb‎

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

‎backends/proc_ctp/tasks.rake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ Dir.glob("#{$resolver.std_path}/proc_cert_model/*.yaml") do |f|
2525
"#{$root}/backends/portfolio/templates/csr_appendix.adoc.erb",
2626
"#{$root}/backends/portfolio/templates/beginning.adoc.erb",
2727
"#{$root}/backends/portfolio/templates/normative_rules.adoc.erb",
28-
"#{$root}/backends/portfolio/templates/test_procedures.adoc.erb",
2928
"#{$root}/backends/proc_cert/templates/typographic.adoc.erb",
3029
"#{$root}/backends/proc_cert/templates/rev_history.adoc.erb",
3130
"#{$root}/backends/proc_cert/templates/related_specs.adoc.erb",

‎backends/proc_ctp/templates/proc_ctp.adoc.erb‎

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -112,70 +112,6 @@ This document is generated by a database backend so all views of the information
112112
<% end -%>
113113
<% end -%>
114114

115-
== Test Procedure View
116-
117-
This section contains just view of the test procedure information organized by kind
118-
(i.e., extension, instruction, or CSR).
119-
This document is generated by a database backend so all views of the information are consistent.
120-
121-
=== Extension Test Procedures
122-
123-
<% proc_cert_model.in_scope_extensions.each do |ext| -%>
124-
<%= portfolio_design.include_erb("test_procedures.adoc.erb", { "db_obj" => ext, "org" => "sep" }) %>
125-
<% end -%>
126-
127-
=== Instruction Test Procedures
128-
129-
<% proc_cert_model.in_scope_instructions(portfolio_design).each do |inst| -%>
130-
<%= portfolio_design.include_erb("test_procedures.adoc.erb", { "db_obj" => inst, "org" => "sep" }) %>
131-
<% end -%>
132-
133-
=== CSR Test Procedures
134-
135-
<% proc_cert_model.in_scope_csrs(portfolio_design).each do |csr| -%>
136-
<%= portfolio_design.include_erb("test_procedures.adoc.erb", { "db_obj" => csr, "org" => "sep" }) %>
137-
<% csr.possible_fields.each do |field| -%>
138-
<%= portfolio_design.include_erb("test_procedures.adoc.erb", { "db_obj" => field, "org" => "sep" }) %>
139-
<% end -%>
140-
<% end -%>
141-
142-
== Combined View
143-
144-
This section contains a combined view of the normative rule and test procedure information organized
145-
by kind (i.e., extension, instruction, or CSR).
146-
This document is generated by a database backend so all views of the information are consistent.
147-
148-
=== Extension Normative Rules & Test Procedures
149-
150-
<% proc_cert_model.in_scope_extensions.each do |ext| -%>
151-
<%= portfolio_design.include_erb("normative_rules.adoc.erb", { "db_obj" => ext, "org" => "combo"}) %>
152-
<%= portfolio_design.include_erb("test_procedures.adoc.erb", { "db_obj" => ext, "org" => "combo"}) %>
153-
<% end -%>
154-
155-
=== Instruction Normative Rules & Test Procedures
156-
157-
<% proc_cert_model.in_scope_instructions(portfolio_design).each do |inst| -%>
158-
<%= portfolio_design.include_erb("normative_rules.adoc.erb", { "db_obj" => inst, "org" => "combo"}) %>
159-
<%= portfolio_design.include_erb("test_procedures.adoc.erb", { "db_obj" => inst, "org" => "combo"}) %>
160-
<% end -%>
161-
162-
=== CSR Normative Rules & Test Procedures
163-
164-
<% proc_cert_model.in_scope_csrs(portfolio_design).each do |csr| -%>
165-
<%= portfolio_design.include_erb("normative_rules.adoc.erb", { "db_obj" => csr, "org" => "combo"}) %>
166-
<%= portfolio_design.include_erb("test_procedures.adoc.erb", { "db_obj" => csr, "org" => "combo"}) %>
167-
<% csr.possible_fields.each do |field| -%>
168-
<%= portfolio_design.include_erb("normative_rules.adoc.erb", { "db_obj" => field, "use_description_list" => true, "org" => "combo"}) %>
169-
<%= portfolio_design.include_erb("test_procedures.adoc.erb", { "db_obj" => field, "use_description_list" => true, "org" => "combo"}) %>
170-
<% end -%>
171-
<% end -%>
172-
173-
// Appendices
174-
<%= portfolio_design.include_erb("ext_appendix.adoc.erb", { "gen_ctp_content" => true }) %>
175-
<%= portfolio_design.include_erb("inst_appendix.adoc.erb", { "gen_ctp_content" => true }) %>
176-
<%= portfolio_design.include_erb("csr_appendix.adoc.erb", { "gen_ctp_content" => true }) %>
177-
<%= portfolio_design.include_erb("idl_func_appendix.adoc.erb") %>
178-
179115
<<<
180116
<% $logger.info "Including riscv-unprivileged.adoc" -%>
181117
// Reset chapter numbering

‎spec/schemas/csr_schema.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,6 @@
115115
},
116116
"cert_normative_rules": {
117117
"$ref": "schema_defs.json#/$defs/cert_normative_rules"
118-
},
119-
"cert_test_procedures": {
120-
"$ref": "schema_defs.json#/$defs/cert_test_procedures"
121118
}
122119
},
123120

@@ -269,9 +266,6 @@
269266
},
270267
"cert_normative_rules": {
271268
"$ref": "schema_defs.json#/$defs/cert_normative_rules"
272-
},
273-
"cert_test_procedures": {
274-
"$ref": "schema_defs.json#/$defs/cert_test_procedures"
275269
}
276270
},
277271
"additionalProperties": false,

‎spec/schemas/ext_schema.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@
157157
},
158158
"cert_normative_rules": {
159159
"$ref": "schema_defs.json#/$defs/cert_normative_rules"
160-
},
161-
"cert_test_procedures": {
162-
"$ref": "schema_defs.json#/$defs/cert_test_procedures"
163160
}
164161
},
165162
"additionalProperties": false

‎spec/schemas/inst_schema.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,6 @@
392392
"cert_normative_rules": {
393393
"$ref": "schema_defs.json#/$defs/cert_normative_rules"
394394
},
395-
"cert_test_procedures": {
396-
"$ref": "schema_defs.json#/$defs/cert_test_procedures"
397-
},
398395
"assembly": {
399396
"type": "string",
400397
"description": "Assembly format of the instruction. Can use decode variables"

‎spec/schemas/profile_schema.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
},
2424
"cert_normative_rules": {
2525
"$ref": "schema_defs.json#/$defs/cert_normative_rules"
26-
},
27-
"cert_test_procedures": {
28-
"$ref": "schema_defs.json#/$defs/cert_test_procedures"
2926
}
3027
}
3128
}

0 commit comments

Comments
 (0)