-
-
Notifications
You must be signed in to change notification settings - Fork 15.3k
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.
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
Drop deqp-vksc from vulkan-cts package and upgrade vulkan-cts: 1.3.10.0 -> 1.4.1.3 #391105
base: master
Are you sure you want to change the base?
Conversation
Sounds mostly good to me, thanks! |
It seems like $ deqp-vksc -n dEQP-VKSC.info.device
…
FATAL ERROR: Couldn't match tags from sub.qpa Subprocess failed with exit code 0(0) at vktTestPackage.cpp:1009 |
Do you have a driver that supports Vulkan SC? I also see a similar error message, but I don't think my driver supports Vulkan SC. I did as you suggested, and just dropped Vulkan SC support, rather than creating a new package for it. Perhaps we can add the separate package in the future if we can get a way to confirm that it is working. I also updated the package from 1.4.1.2 to a new 1.4.1.3 tag. |
Seems like we need to remove one of the two leading
Otherwise the change looks good to me (builds and passes tests |
Signed-off-by: Jordan Justen <jljusten@gmail.com>
The Vulkan SC (Safety Critical) CTS has different release tags and build dependencies from the Vulkan CTS. When updating the vulkan-cts package version, I found that the newer version would fail to build if we attempted to build the deqp-vksc executable. I suspect that building the Vulkan SC CTS executable, deqp-vksc, may not be supported unless using a vulkansc-cts-* tag. This change adds cmake build define SELECTED_BUILD_TARGETS=deqp-vk, which was introduced in vulkan-cts-1.3.7.0, and reduces the amount of code built. Notably, it causes the build to no longer attempt to build deqp-vksc. Ref: vulkan-cts b22a8f06d ("Allow selecting a subset of targets at configuration time") Signed-off-by: Jordan Justen <jljusten@gmail.com>
Note that the Vulkan SC executable deqp-vksc had to be dropped (previous patch) from the Vulkan CTS (vulkan-cts) package, or this update would lead to a build failure. Signed-off-by: Jordan Justen <jljusten@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, LGTM!
Vulkan SC (Safety Critical) CTS is separate from the Vulkan CTS. This change splits it out into a separate vulkansc-cts package, and uses the latest Vulkan SC CTS tag, vulkansc-cts-1.0.2.1 with this package.
Then, the Vulkan CTS is upgraded: 1.3.10.0 -> 1.4.1.2.
These changes were prompted by the Vulkan SC executable (deqp-vksc) failing to build with the newer Vulkan CTS version. This build failure is not a bug of the CTS as the vulkan-cts-* tags are for the Vulkan CTS and not the Vulkan SC CTS. In other words, vulkan-cts-* tags support the Vulkan CTS and vulcansc-cts-* tags support the Vulkan SC CTS.
I don't have access to a Vulkan SC setup, so I was only able to test this command (to dump the CTS test names) with the new vulkansc-cts package:
deqp-vksc --deqp-runmode=txt-caselist
Cc: @Flakebi
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)