Skip to content
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

Enable C++ 20 standard globally #1257

Open
wants to merge 6 commits into
base: main
Choose a base branch
from

Conversation

SaschaWillems
Copy link
Collaborator

Description

Note: This is work-in-progress and not ready for review yet. I didn't set it to "draft", as I wanted to test CI to see where things break with C++ 20.

Refs #1201

General Checklist:

Please ensure the following points are checked:

  • My code follows the coding style
  • I have reviewed file licenses
  • I have commented any added functions (in line with Doxygen)
  • I have commented any code that could be hard to understand
  • My changes do not add any new compiler warnings
  • My changes do not add any new validation layer errors or warnings
  • I have used existing framework/helper functions where possible
  • My changes do not add any regressions
  • I have tested every sample to ensure everything runs correctly
  • This PR describes the scope and expected impact of the changes I am making

Note: The Samples CI runs a number of checks including:

  • I have updated the header Copyright to reflect the current year (CI build will fail if Copyright is out of date)
  • My changes build on Windows, Linux, macOS and Android. Otherwise I have documented any exceptions

If this PR contains framework changes:

  • I did a full batch run using the batch command line argument to make sure all samples still work properly

Sample Checklist

If your PR contains a new or modified sample, these further checks must be carried out in addition to the General Checklist:

  • I have tested the sample on at least one compliant Vulkan implementation
  • If the sample is vendor-specific, I have tagged it appropriately
  • I have stated on what implementation the sample has been tested so that others can test on different implementations and platforms
  • Any dependent assets have been merged and published in downstream modules
  • For new samples, I have added a paragraph with a summary to the appropriate chapter in the readme of the folder that the sample belongs to e.g. api samples readme
  • For new samples, I have added a tutorial README.md file to guide users through what they need to know to implement code using this feature. For example, see conditional_rendering
  • For new samples, I have added a link to the Antora navigation so that the sample will be listed at the Vulkan documentation site

Old style no longer worked due to C++20 compile time requirements
@SaschaWillems
Copy link
Collaborator Author

Once we merge this, I think we can remove one or two external dependencies (submodules). Right now. printing formatted messages (e.g. errors) is knda complicated and goes through our framework and two externeal dependencies. One of those is "fmt", and it seems that it's functionality is also present in the STL with C++20. So we could get rid of "fmt" and maybe also "spdlog". I don't think we need to have such a complicated setup just for logging.

Copy link

@jackk18912525 jackk18912525 left a comment

Choose a reason for hiding this comment

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

A

@SaschaWillems
Copy link
Collaborator Author

@jackk18912525: Can you please remove your spam comment and also remove yourself from the reviewers?

@SaschaWillems
Copy link
Collaborator Author

A blocker is the HCWPipe third party dependency. I can't get it to compile after updating to C++20, and updating the submodule doesn't help either (esp.a s the library is now differently named). I need help on this from someone from arm, maybe @JoseEmilio-ARM?

@JoseEmilio-ARM JoseEmilio-ARM removed the request for review from jackk18912525 January 27, 2025 16:28
@JoseEmilio-ARM JoseEmilio-ARM dismissed jackk18912525’s stale review January 27, 2025 16:40

Submitted accidentally

@SaschaWillems
Copy link
Collaborator Author

@JoseEmilio-ARM : Any update on this? I'm stuck until someone with proper knowledge updates HCWPipe.

@JoseEmilio-ARM JoseEmilio-ARM mentioned this pull request Feb 9, 2025
13 tasks
@JoseEmilio-ARM
Copy link
Collaborator

@JoseEmilio-ARM : Any update on this? I'm stuck until someone with proper knowledge updates HCWPipe.

Hi @SaschaWillems , please try again with the changes in #1273

@SaschaWillems
Copy link
Collaborator Author

Awesome. Thank you very much :)

# Conflicts:
#	framework/platform/platform.cpp
@CLAassistant
Copy link

CLAassistant commented Feb 25, 2025

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

@SaschaWillems
Copy link
Collaborator Author

@JoseEmilio-ARM : Builds are still failing for me on Android. Seems the HCWStatsProvider needs to be updated to work with C++20:

/home/runner/work/Vulkan-Samples/Vulkan-Samples/framework/stats/hwcpipe_stats_provider.cpp:47:14: error: no matching constructor for initialization of 'StatDataMap' (aka 'unordered_map<StatIndex, StatData, StatIndexHash>')
2025-02-25T16:05:45.9780418Z      47 |         StatDataMap hwcpipe_stats = {
2025-02-25T16:05:45.9781083Z         |                     ^               ~
2025-02-25T16:05:45.9781771Z      48 |             {StatIndex::gpu_cycles,            {hwcpipe_counter::MaliGPUActiveCy}},
2025-02-25T16:05:45.9782517Z         |             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2025-02-25T16:05:45.9783593Z      49 |             {StatIndex::gpu_vertex_cycles,     {hwcpipe_counter::MaliNonFragQueueActiveCy, {MaliNonFragActiveCy, MaliBinningQueueActiveCy} }},
2025-02-25T16:05:45.9785185Z         |             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2025-02-25T16:05:45.9785969Z      50 |             {StatIndex::gpu_load_store_cycles, {hwcpipe_counter::MaliLSIssueCy}},
2025-02-25T16:05:45.9786661Z         |             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2025-02-25T16:05:45.9787351Z      51 |             {StatIndex::gpu_tiles,             {hwcpipe_counter::MaliFragTile}},
2025-02-25T16:05:45.9787997Z         |             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2025-02-25T16:05:45.9788683Z      52 |             {StatIndex::gpu_killed_tiles,      {hwcpipe_counter::MaliFragTileKill}},
2025-02-25T16:05:45.9789578Z         |             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2025-02-25T16:05:45.9790788Z      53 |             {StatIndex::gpu_fragment_cycles,   {hwcpipe_counter::MaliFragQueueActiveCy, {MaliFragActiveCy, MaliMainQueueActiveCy}}},
2025-02-25T16:05:45.9791865Z         |             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2025-02-25T16:05:45.9792759Z      54 |             {StatIndex::gpu_fragment_jobs,     {hwcpipe_counter::MaliFragQueueJob, {MaliMainQueueJob}}},
2025-02-25T16:05:45.9793575Z         |             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2025-02-25T16:05:45.9794289Z      55 |             {StatIndex::gpu_ext_reads,         {hwcpipe_counter::MaliExtBusRdBt}},
2025-02-25T16:05:45.9794949Z         |             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2025-02-25T16:05:45.9795639Z      56 |             {StatIndex::gpu_ext_writes,        {hwcpipe_counter::MaliExtBusWrBt}},
2025-02-25T16:05:45.9796294Z         |             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2025-02-25T16:05:45.9796994Z      57 |             {StatIndex::gpu_ext_read_stalls,   {hwcpipe_counter::MaliExtBusRdStallCy}},
2025-02-25T16:05:45.9797691Z         |             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2025-02-25T16:05:45.9798399Z      58 |             {StatIndex::gpu_ext_write_stalls,  {hwcpipe_counter::MaliExtBusWrStallCy}},
2025-02-25T16:05:45.9799103Z         |             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2025-02-25T16:05:45.9799785Z      59 |             {StatIndex::gpu_ext_read_bytes,    {hwcpipe_counter::MaliExtBusRdBy}},
2025-02-25T16:05:45.9800443Z         |             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2025-02-25T16:05:45.9801325Z      60 |             {StatIndex::gpu_ext_write_bytes,   {hwcpipe_counter::MaliExtBusWrBy}},
2025-02-25T16:05:45.9802002Z         |             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2025-02-25T16:05:45.9811329Z      61 |             {StatIndex::gpu_tex_cycles,        {hwcpipe_counter::MaliTexIssueCy}}};
2025-02-25T16:05:45.9812044Z         |             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Any idea on how to fix this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants