Triangle, million triangle and compute tests on local

Author: semihguresci

docker/.dockerignore .dockerignoredocker/.dockerignore renamed to .dockerignore

@@ -1,4 +1,3 @@
-# build outputs
 out/
 build/
 cmake-build-*/
@@ -10,17 +9,15 @@ compile_commands.json
 Testing/
 CTestTestfile.cmake
 
-# git + editor stuff
 .git/
 .gitignore
 .vscode/
 .idea/
+.vs/
 
-# OS junk
 .DS_Store
 Thumbs.db
 
-# optional: large artifacts
 *.tar
 *.tar.gz
-results/
+results/

.gitignore

@@ -4,11 +4,6 @@ results/*.txt
 results/*.qdrep
 results/*.nsys-rep
 results/*.sqlite
-<<<<<<< ours
-<<<<<<< ours
 /.vs
 /out
-=======
->>>>>>> theirs
-=======
->>>>>>> theirs
+/results

AGENTS.md

@@ -0,0 +1,50 @@
+# AGENTS.md
+
+## Purpose
+
+Guidance for coding agents working in this repository.
+
+## Project summary
+
+- Project: `vk-bench` Vulkan micro-benchmark.
+- Language: C++ (single primary source file: `src/main.cpp`).
+- Build: CMake.
+- Runtime: Linux Docker workflow with NVIDIA GPU (`--gpus all`) is the default path.
+
+## What to optimize for
+
+- Keep benchmark behavior deterministic and easy to compare run-to-run.
+- Prefer small, reviewable changes over broad refactors.
+- Preserve JSON output compatibility unless a change is explicitly requested.
+
+## Editing rules
+
+- Avoid changing benchmark semantics (scene workloads, frame loops, timing region boundaries) unless requested.
+- Add comments only where logic is non-obvious (timing, synchronization, resource lifetime).
+- Keep code style consistent with existing file formatting and naming.
+- Do not add dependencies unless they are necessary and justified.
+
+## Verification checklist
+
+When changing code, run what is feasible in the environment:
+
+1. Configure/build with CMake.
+2. Run a short headless benchmark (`--frames` small) and verify JSON output is written.
+3. Confirm no obvious regressions in CLI arguments or scene dispatch.
+
+If GPU execution is not available, state what could not be validated.
+
+## Key files
+
+- `src/main.cpp`: Vulkan setup, scene execution, timing collection, JSON output.
+- `CMakeLists.txt`: targets, shader compilation/install, window mode options.
+- `scripts/run_bench.sh`: scripted benchmark runs in Docker.
+- `scripts/nsight_capture.sh`: Nsight Systems capture helper.
+- `scripts/collect_system_info.sh`: host/container environment capture.
+- `README.md`: user-facing usage and run instructions.
+
+## Common pitfalls
+
+- Do not assume window mode is available; respect `VK_BENCH_HAS_WINDOW`.
+- Keep shader lookup behavior intact (`VK_BENCH_SHADER_DIR`, executable-local shaders, fallback paths).
+- Ensure Vulkan objects are destroyed in reverse-lifetime order on every exit path.

CMakeLists.txt

@@ -6,56 +6,62 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 find_package(Vulkan REQUIRED)
-<<<<<<< ours
-<<<<<<< ours
 include(cmake/compile_shaders.cmake)
 
-set(SHADER_DIR  "${CMAKE_CURRENT_SOURCE_DIR}/shaders")
-set(SPIRV_DIR   "${CMAKE_CURRENT_BINARY_DIR}/shaders")
+option(VK_BENCH_ENABLE_WINDOW "Enable window mode support (requires GLFW)" ON)
+option(VK_BENCH_FETCH_GLFW
+       "Download and build GLFW if it is not available on the system" ON)
+
+set(VK_BENCH_HAS_WINDOW OFF)
+set(VK_BENCH_GLFW_TARGET "")
+
+if (VK_BENCH_ENABLE_WINDOW)
+  find_package(glfw3 QUIET)
+
+  if (glfw3_FOUND)
+    set(VK_BENCH_HAS_WINDOW ON)
+    set(VK_BENCH_GLFW_TARGET glfw)
+    message(STATUS "Using system glfw3 package")
+  elseif (VK_BENCH_FETCH_GLFW)
+    include(FetchContent)
+    FetchContent_Declare(
+      glfw
+      GIT_REPOSITORY https://github.com/glfw/glfw.git
+      GIT_TAG 3.4
+    )
+    set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
+    set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+    set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+    set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
+    FetchContent_MakeAvailable(glfw)
+    set(VK_BENCH_HAS_WINDOW ON)
+    set(VK_BENCH_GLFW_TARGET glfw)
+    message(STATUS "Using fetched GLFW (3.4)")
+  else()
+    message(STATUS
+            "glfw3 not found and VK_BENCH_FETCH_GLFW=OFF: windowed rendering disabled, use --headless")
+  endif()
+else()
+  message(STATUS "VK_BENCH_ENABLE_WINDOW=OFF: windowed rendering disabled, use --headless")
+endif()
+
+set(SHADER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/shaders")
+set(SPIRV_DIR "${CMAKE_CURRENT_BINARY_DIR}/shaders")
+file(TO_CMAKE_PATH "${SPIRV_DIR}" SPIRV_DIR_CMAKE)
 vk_compile_slang_shaders(SHADER_OUTPUTS vk-bench-shaders "${SHADER_DIR}" "${SPIRV_DIR}")
+
 add_executable(vk-bench src/main.cpp)
 target_include_directories(vk-bench PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include")
+target_compile_definitions(vk-bench PRIVATE VK_BENCH_SHADER_DIR="${SPIRV_DIR_CMAKE}")
 target_link_libraries(vk-bench PRIVATE Vulkan::Vulkan)
+if (VK_BENCH_HAS_WINDOW)
+  target_link_libraries(vk-bench PRIVATE ${VK_BENCH_GLFW_TARGET})
+  target_compile_definitions(vk-bench PRIVATE VK_BENCH_HAS_WINDOW=1)
+else()
+  target_compile_definitions(vk-bench PRIVATE VK_BENCH_HAS_WINDOW=0)
+endif()
 
 add_dependencies(vk-bench vk-bench-shaders)
 
 install(TARGETS vk-bench RUNTIME DESTINATION bin)
 install(FILES ${SHADER_OUTPUTS} DESTINATION bin/shaders)
-=======
-=======
->>>>>>> theirs
-find_program(SLANGC slangc REQUIRED)
-
-set(SHADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/shaders)
-set(SPIRV_DIR ${CMAKE_CURRENT_BINARY_DIR}/shaders)
-file(MAKE_DIRECTORY ${SPIRV_DIR})
-
-set(SHADER_OUTPUTS
-  ${SPIRV_DIR}/triangle.vert.spv
-  ${SPIRV_DIR}/triangle.frag.spv
-)
-
-add_custom_command(
-  OUTPUT ${SPIRV_DIR}/triangle.vert.spv
-  COMMAND ${SLANGC} -target spirv -profile glsl_460 -entry main -stage vertex ${SHADER_DIR}/triangle.vert.slang -o ${SPIRV_DIR}/triangle.vert.spv
-  DEPENDS ${SHADER_DIR}/triangle.vert.slang
-)
-
-add_custom_command(
-  OUTPUT ${SPIRV_DIR}/triangle.frag.spv
-  COMMAND ${SLANGC} -target spirv -profile glsl_460 -entry main -stage fragment ${SHADER_DIR}/triangle.frag.slang -o ${SPIRV_DIR}/triangle.frag.spv
-  DEPENDS ${SHADER_DIR}/triangle.frag.slang
-)
-
-add_custom_target(vk-bench-shaders DEPENDS ${SHADER_OUTPUTS})
-
-add_executable(vk-bench src/main.cpp)
-add_dependencies(vk-bench vk-bench-shaders)
-target_include_directories(vk-bench PRIVATE include)
-target_link_libraries(vk-bench PRIVATE Vulkan::Vulkan)
-install(TARGETS vk-bench RUNTIME DESTINATION bin)
-install(FILES ${SHADER_OUTPUTS} DESTINATION bin/shaders)
-<<<<<<< ours
->>>>>>> theirs
-=======
->>>>>>> theirs

Dockerfile

@@ -1,26 +1,43 @@
-FROM nvidia/vulkan:1.3.280-ubuntu22.04
+FROM nvidia/cuda:13.1.1-cudnn-devel-ubuntu24.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
     cmake \
     pkg-config \
+    libvulkan1 \
+    libvulkan-dev \
     vulkan-tools \
+    mesa-vulkan-drivers \
     curl \
     ca-certificates \
     && rm -rf /var/lib/apt/lists/*
 
-ARG SLANG_VERSION=2024.17.2
-RUN curl -fsSL -o /tmp/slang.tar.gz https://github.com/shader-slang/slang/releases/download/v${SLANG_VERSION}/slang-${SLANG_VERSION}-linux-x86_64.tar.gz \
-    && tar -xzf /tmp/slang.tar.gz -C /tmp \
-    && install -m 0755 /tmp/slang-${SLANG_VERSION}/bin/slangc /usr/local/bin/slangc \
-    && rm -rf /tmp/slang.tar.gz /tmp/slang-${SLANG_VERSION}
+ARG SLANG_VERSION=2026.3.1
+RUN set -eux; \
+    mkdir -p /opt/slang; \
+    curl -fsSL -o /tmp/slang.tar.gz \
+      "https://github.com/shader-slang/slang/releases/download/v${SLANG_VERSION}/slang-${SLANG_VERSION}-linux-x86_64.tar.gz"; \
+    tar -xzf /tmp/slang.tar.gz -C /opt/slang; \
+    rm -f /tmp/slang.tar.gz; \
+    SLANGC_PATH="$(find /opt/slang -type f -name slangc -perm -111 | head -n 1)"; \
+    test -n "$SLANGC_PATH"; \
+    install -m 0755 "$SLANGC_PATH" /usr/local/bin/slangc; \
+    SLANG_LIB_DIR="$(dirname "$(find /opt/slang -type f -name 'libslang-compiler.so*' | head -n 1)")"; \
+    test -n "$SLANG_LIB_DIR"; \
+    echo "$SLANG_LIB_DIR" > /etc/ld.so.conf.d/slang.conf; \
+    ldconfig; \
+    slangc -version
 
 WORKDIR /workspace
 COPY CMakeLists.txt /workspace/CMakeLists.txt
+COPY cmake /workspace/cmake
 COPY src /workspace/src
 COPY include /workspace/include
 COPY shaders /workspace/shaders
 RUN cmake -S /workspace -B /workspace/build -DCMAKE_BUILD_TYPE=Release \
+    -DVK_BENCH_ENABLE_WINDOW=OFF \
+    -DVK_BENCH_FETCH_GLFW=OFF \
+    -DSLANGC=/usr/local/bin/slangc \
     && cmake --build /workspace/build --config Release -j"$(nproc)" \
     && install -m 0755 /workspace/build/vk-bench /usr/local/bin/vk-bench \
     && install -d /usr/local/bin/shaders \