Rebase power measurement with main branch

.github/workflows/android-build.yml

@@ -13,7 +13,7 @@ permissions: read-all
 jobs:
   android-build:
     name: Check Android build with gradle
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-24.04"
     strategy:
       fail-fast: true
     steps:

.github/workflows/check-formatting.yml

@@ -13,11 +13,11 @@ permissions: read-all
 jobs:
   clang-format-check:
     name: clang-format
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-24.04"
     steps:
       - name: Setup clang-format
         run: |
-          sudo apt-get install -yqq clang-format-12
+          sudo apt-get install -yqq clang-format-14
       - name: Checkout repository
         uses: actions/checkout@v3
         with:

.github/workflows/linux-build.yml

@@ -13,13 +13,13 @@ permissions: read-all
 jobs:
   linux-build:
     name: Build and run tests on Linux
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-24.04"
     steps:
       - name: Setup necessary packages
         run: |
           sudo add-apt-repository ppa:kisak/kisak-mesa -y
           sudo apt update && sudo apt install libxrandr-dev libxinerama-dev libx11-dev libxcursor-dev libxi-dev libx11-xcb-dev clang \
-          mesa-vulkan-drivers
+          mesa-vulkan-drivers imagemagick
       - name: Setup Vulkan SDK
         run: |
           wget -q https://sdk.lunarg.com/sdk/download/1.3.268.0/linux/vulkansdk-linux-x86_64-1.3.268.0.tar.xz
@@ -76,7 +76,7 @@ jobs:
           xvfb-run -a ./vk_graphics_pipeline --frame-count 2 --screenshot-frame-number 1
           convert screenshot_frame_1.ppm vk_graphics_pipeline_screenshot.png
       - name: Upload screenshots
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: build/bin/*.png

.github/workflows/windows-build.yml

@@ -100,7 +100,7 @@ jobs:
           .\dx12_graphics_pipeline --headless --frame-count 2 --screenshot-frame-number 1
           magick convert screenshot_frame_1.ppm dx12_graphics_pipeline_screenshot.png
       - name: Upload screenshots
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: build\bin\Debug\*.png

CMakeLists.txt

@@ -141,6 +141,7 @@ if(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MSVC_DISABLED_WARNINGS} /MP /Zc:__cplusplus /std:c++17")
 else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+        -Werror \
         -std=c++17 \
         -fdiagnostics-color=always \
         -Wno-nullability-completeness \
@@ -153,12 +154,10 @@ else()
         -Wno-pointer-bool-conversion \
     ")
 
-    if (NOT PPX_BUILD_XR)
-        # OpenXR has way too many warnings to enable -Werror with it.
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
-            -Werror \
-        ")
-    endif ()
+endif()
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.0)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-template-arg-list-after-template-kw")
 endif()
 
 set(CMAKE_CXX_STANDARD 17)
@@ -255,6 +254,9 @@ endif()
 if (PPX_BUILD_XR)
     message("Building OpenXR support")
     configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR})
+    if (PPX_LINUX)
+        add_compile_options(-Wno-tautological-pointer-compare -Wno-error=address)
+    endif()
     add_subdirectory(third_party/OpenXR-SDK-Source)
 endif()
 

assets/benchmarks/shaders/Benchmark_Quad.hlsli

@@ -0,0 +1,43 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef BENCHMARKS_QUAD_HLSLI
+#define BENCHMARKS_QUAD_HLSLI
+
+struct ConfigParams {
+  uint32_t InstCount;
+  uint32_t RandomSeed;
+  uint32_t TextureCount;
+  float3 ColorValue;
+};
+
+#if defined(__spirv__)
+[[vk::push_constant]]
+#endif
+ConstantBuffer<ConfigParams> Config : register(b0);
+
+struct VSOutputPos {
+  float4 position : SV_POSITION;
+};
+
+float randomCompute(uint32_t instCount, float4 Position) {
+  float randNum = frac(float(instCount) * 123.456f);
+  for (uint32_t i = 0; i < instCount; i++) {
+    Position.z += Position.x * (1 - randNum) + randNum * Position.y;
+  }
+
+  return frac(Position.z);;
+}
+
+#endif // BENCHMARKS_QUAD_HLSLI

assets/benchmarks/shaders/Benchmark_RandomNoise.hlsl

@@ -12,17 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "VsOutput.hlsli"
-
-struct RandomParams
-{
-    uint32_t Seed;
-};
-
-#if defined(__spirv__)
-[[vk::push_constant]]
-#endif
-ConstantBuffer<RandomParams> Random : register(b0);
+#include "Benchmark_Quad.hlsli"
 
 float random(float2 st, uint32_t seed) {
     float underOne = sin(float(seed) + 0.5f);
@@ -32,6 +22,6 @@ float random(float2 st, uint32_t seed) {
 
 float4 psmain(VSOutputPos input) : SV_TARGET
 {
-    float rnd = random(input.position.xy, Random.Seed);
+    float rnd = random(input.position.xy, Config.RandomSeed);
     return float4(rnd, rnd, rnd, 1.0f);
 }

assets/benchmarks/shaders/Benchmark_SolidColor.hlsl

@@ -12,19 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "VsOutput.hlsli"
-
-struct ColorParams
-{
-    float3 Value;
-};
-
-#if defined(__spirv__)
-[[vk::push_constant]]
-#endif
-ConstantBuffer<ColorParams> Color : register(b0);
+#include "Benchmark_Quad.hlsli"
 
 float4 psmain(VSOutputPos input) : SV_TARGET
 {
-    return float4(Color.Value, 1.0f);
+    float4 color = float4(Config.ColorValue, 1.0f);
+    color.a = randomCompute(Config.InstCount, input.position) + 0.5f;
+    return color;
 }

assets/benchmarks/shaders/Benchmark_Texture-100.hlsl

@@ -0,0 +1,43 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "Benchmark_Quad.hlsli"
+
+Texture2D Tex[10]  : register(t1);  // Slot 0 is used by push constant.
+RWStructuredBuffer<float> dataBuffer : register(u11);
+
+float4 psmain(VSOutputPos input) : SV_TARGET
+{
+    uint32_t textureCount = Config.TextureCount;
+    float4 color1 = {0.0f, 0.0f, 0.0f, 0.0f};
+    float4 color2 = {0.0f, 0.0f, 0.0f, 0.0f};
+    float4 color3 = {0.0f, 0.0f, 0.0f, 0.0f};
+    for(uint32_t i = 0; i < textureCount; i++)
+    {
+        color1 += Tex[i].Load(uint3(input.position.x, input.position.y, 0))/float(textureCount);
+    }
+    for(uint32_t i = 0; i < textureCount; i++)
+    {
+        color2 += Tex[i].Load(uint3(input.position.x, input.position.y, 0));
+    }
+    for(uint32_t i = 0; i < textureCount; i++)
+    {
+        color3 += Tex[i].Load(uint3(input.position.x + 1, input.position.y + 1, 0))/float(textureCount);
+    }
+    float4 color = color1 + 0.5f * color2 + 0.25f * color3;
+    if (!any(color))
+        dataBuffer[0] = color.r;
+    color.a = randomCompute(Config.InstCount, input.position); 
+    return color;
+}

assets/benchmarks/shaders/Benchmark_Texture-62.hlsl

@@ -0,0 +1,42 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "Benchmark_Quad.hlsli"
+
+Texture2D Tex[10]  : register(t1);  // Slot 0 is used by push constant.
+RWStructuredBuffer<float> dataBuffer : register(u11);
+
+float4 psmain(VSOutputPos input) : SV_TARGET
+{
+    uint32_t textureCount = Config.TextureCount;
+    float4 color1 = {0.0f, 0.0f, 0.0f, 0.0f};
+    float4 color2 = {0.0f, 0.0f, 0.0f, 0.0f};
+
+    for(uint32_t i = 0; i < textureCount; i++)
+    {
+        color1 += Tex[i].Load(uint3(input.position.x, input.position.y, 0))/float(textureCount);
+    }
+
+    for(uint32_t i = 0; i < textureCount; i++)
+    {
+        color2 += Tex[i].Load(uint3(input.position.x, input.position.y, 0));
+    }
+
+    float4 color = color1 + 0.5f * color2;
+
+    if (!any(color))
+        dataBuffer[0] = color.r;
+    color.a = randomCompute(Config.InstCount, input.position); 
+    return color;
+}

assets/benchmarks/shaders/Benchmark_Texture-75.hlsl

@@ -0,0 +1,35 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "Benchmark_Quad.hlsli"
+
+Texture2D Tex[10]  : register(t1);  // Slot 0 is used by push constant.
+RWStructuredBuffer<float> dataBuffer : register(u11);
+
+float4 psmain(VSOutputPos input) : SV_TARGET
+{
+    uint32_t textureCount = Config.TextureCount;
+    float4 color1 = {0.0f, 0.0f, 0.0f, 0.0f};
+
+    for(uint32_t i = 0; i < textureCount; i++)
+    {
+        color1 += Tex[i].Load(uint3(input.position.x, input.position.y, 0))/float(textureCount);
+    }
+
+    float4 color = color1;
+    if (!any(color))
+        dataBuffer[0] = color.r;
+    color.a = randomCompute(Config.InstCount, input.position);
+    return color;
+}

assets/benchmarks/shaders/Benchmark_VsSimpleQuads.hlsl

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "VsOutput.hlsli"
+#include "Benchmark_Quad.hlsli"
 
-VSOutputPos vsmain(float4 Position : POSITION)
-{
-	VSOutputPos result;
-	result.position = Position;
-	return result;
+VSOutputPos vsmain(float4 Position : POSITION) {
+  VSOutputPos result;
+  result.position = Position;
+  result.position.z = randomCompute(Config.InstCount, result.position);
+  return result;
 }

assets/benchmarks/shaders/CMakeLists.txt

@@ -82,22 +82,32 @@ generate_rules_for_shader("shader_benchmark_skybox"
 
 generate_rules_for_shader("shader_benchmark_vs_simple_quads"
     SOURCE "${PPX_DIR}/assets/benchmarks/shaders/Benchmark_VsSimpleQuads.hlsl"
-    INCLUDES "${PPX_DIR}/assets/benchmarks/shaders/VsOutput.hlsli"
+    INCLUDES "${PPX_DIR}/assets/benchmarks/shaders/Benchmark_Quad.hlsli"
     STAGES "vs")
 
 generate_rules_for_shader("shader_benchmark_random_noise"
     SOURCE "${PPX_DIR}/assets/benchmarks/shaders/Benchmark_RandomNoise.hlsl"
-    INCLUDES "${PPX_DIR}/assets/benchmarks/shaders/VsOutput.hlsli"
+    INCLUDES "${PPX_DIR}/assets/benchmarks/shaders/Benchmark_Quad.hlsli"
     STAGES "ps")
 
 generate_rules_for_shader("shader_benchmark_solid_color"
     SOURCE "${PPX_DIR}/assets/benchmarks/shaders/Benchmark_SolidColor.hlsl"
-    INCLUDES "${PPX_DIR}/assets/benchmarks/shaders/VsOutput.hlsli"
+    INCLUDES "${PPX_DIR}/assets/benchmarks/shaders/Benchmark_Quad.hlsli"
     STAGES "ps")
 
-generate_rules_for_shader("shader_benchmark_texture"
-    SOURCE "${PPX_DIR}/assets/benchmarks/shaders/Benchmark_Texture.hlsl"
-    INCLUDES "${PPX_DIR}/assets/benchmarks/shaders/VsOutput.hlsli"
+generate_rules_for_shader("shader_benchmark_texture-75"
+    SOURCE "${PPX_DIR}/assets/benchmarks/shaders/Benchmark_Texture-75.hlsl"
+    INCLUDES "${PPX_DIR}/assets/benchmarks/shaders/Benchmark_Quad.hlsli"
+    STAGES "ps")
+
+generate_rules_for_shader("shader_benchmark_texture-100"
+    SOURCE "${PPX_DIR}/assets/benchmarks/shaders/Benchmark_Texture-100.hlsl"
+    INCLUDES "${PPX_DIR}/assets/benchmarks/shaders/Benchmark_Quad.hlsli"
+    STAGES "ps")
+
+generate_rules_for_shader("shader_benchmark_texture-62"
+    SOURCE "${PPX_DIR}/assets/benchmarks/shaders/Benchmark_Texture-62.hlsl"
+    INCLUDES "${PPX_DIR}/assets/benchmarks/shaders/Benchmark_Quad.hlsli"
     STAGES "ps")
 
 generate_rules_for_shader("shader_foveation_benchmark"

benchmarks/graphics_pipeline/CMakeLists.txt

@@ -15,7 +15,7 @@ project(graphics_pipeline)
 
 add_samples_for_all_apis(
     NAME ${PROJECT_NAME}
-    SOURCES 
+    SOURCES
       "FreeCamera.h"
       "FreeCamera.cpp"
       "GraphicsBenchmarkApp.h"
@@ -34,6 +34,8 @@ add_samples_for_all_apis(
       "shader_benchmark_random_noise"
       "shader_benchmark_skybox"
       "shader_benchmark_solid_color"
-      "shader_benchmark_texture"
+      "shader_benchmark_texture-75"
+      "shader_benchmark_texture-100"
+      "shader_benchmark_texture-62"
       "shader_benchmark_vs_simple_quads"
       "shader_fullscreen_triangle")