Skip to content

Ensure cl.xml passes validation #831

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

Merged
bashbaug merged 2 commits into from
Sep 8, 2022
Merged

Ensure cl.xml passes validation #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc2f65e
Ensure cl.xml passes validation
alycm Sep 7, 2022
6c9c4c6
Add XML validation to CI
alycm Sep 7, 2022
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
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rvm:
- 2.3.3

before_install:
- sudo apt-get install -y libpango1.0-dev ghostscript fonts-lyx
- sudo apt-get install -y libpango1.0-dev ghostscript fonts-lyx jing
- gem install asciidoctor -v 2.0.16
- gem install coderay -v 1.1.1
- gem install rouge -v 3.19.0
Expand All @@ -20,6 +20,7 @@ before_install:
script:
- git describe --tags --dirty
- make -O -j 5 api c env ext cxx4opencl manhtmlpages
- make -C xml validate

deploy:
provider: releases
Expand Down
7 changes: 2 additions & 5 deletions xml/cl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ server's OpenCL/api-docs repository.
<enum value="SIZE_MAX" name="CL_IMPORT_MEMORY_WHOLE_ALLOCATION_ARM"/>
</enums>

<enums name="Constants.cl_intel_command_queue_families" vendor="Intel" commant="cl_intel_command_queue_families constants, in cl_ext.h">
<enums name="Constants.cl_intel_command_queue_families" vendor="Intel" comment="cl_intel_command_queue_families constants, in cl_ext.h">
<enum value="64" name="CL_QUEUE_FAMILY_MAX_NAME_SIZE_INTEL"/>
<enum value="0" name="CL_QUEUE_DEFAULT_CAPABILITIES_INTEL"/>
</enums>
Expand Down Expand Up @@ -7144,13 +7144,10 @@ server's OpenCL/api-docs repository.
<enum name="CL_QUEUE_JOB_SLOT_ARM"/>
</require>
</extension>
<extension name="cl_khr_command_buffer_mutable_dispatch" comment="version 0.9.0" supported="opencl">
<extension name="cl_khr_command_buffer_mutable_dispatch" requires="cl_khr_command_buffer" comment="version 0.9.0" supported="opencl">
<require>
<type name="CL/cl.h"/>
</require>
<require>
<extension name="cl_khr_command_buffer"/>
</require>
<require>
<type name="cl_command_buffer_structure_type_khr"/>
<type name="cl_mutable_dispatch_fields_khr"/>
Expand Down
3 changes: 3 additions & 0 deletions xml/registry.rnc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ Extension = element extension {
attribute type { text } ? ,
attribute requires { text } ? ,
attribute requiresCore { text } ? ,
attribute condition { text } ? ,
attribute supported { StringGroup } ? ,
attribute promotedto { text } ? ,
attribute deprecatedby { text } ? ,
Expand All @@ -445,6 +446,7 @@ Extension = element extension {
(
element require {
attribute api { text } ? ,
attribute condition { text } ? ,
ProfileName ? ,
ExtensionName ? ,
FeatureName ? ,
Expand Down Expand Up @@ -478,6 +480,7 @@ InterfaceElement =
Enum |
element command {
Name ,
attribute requires { text } ? ,
Copy link
Contributor Author

@alycm alycm Sep 7, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I flip-flopped on whether this should be a schema change or an XML change. I landed on schema change because the single use of this pattern does seem valid.

It is for clEnqueueMigrateMemINTEL within cl_intel_unified_shared_memory which requires="CL_VERSION_1_2". In other cases it's the entire extension that requires an OpenCL version, but this instance is specified at a finer granularity.

Copy link
Contributor

@bashbaug bashbaug Sep 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I remember discussing various options for clEnqueueMigrateMemINTEL and settling on this as the best option, though I can't find the discussion in an issue so it may have been in a PR comment. I agree this could be a useful pattern going forward for other extensions, as well.

Copy link
Contributor

@SunSerega SunSerega Sep 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't see a discussion on this specifically, but here you say you settled on this to get things un-stuck.
And the requires="CL_VERSION_1_2" didn't exist on clEnqueueMigrateMemINTEL before #290 - checked with git blame.

Comment ?
}

Expand Down