Use Ninja in swiftshader build script.
* We already require it for the main cmake side, so seems harmless to require it here too. Speeds up my builds by many minutes.
* Fix a couple of small bugs in the doc.
Closes https://github.com/google/iree/pull/1577
COPYBARA_INTEGRATE_REVIEW=https://github.com/google/iree/pull/1577 from google:swiftbuild1 94328e5b44414940377f6153457e825ff6595955
PiperOrigin-RevId: 307649960
diff --git a/build_tools/third_party/swiftshader/build_vk_swiftshader.sh b/build_tools/third_party/swiftshader/build_vk_swiftshader.sh
index 1cd06a3..9f93b01 100644
--- a/build_tools/third_party/swiftshader/build_vk_swiftshader.sh
+++ b/build_tools/third_party/swiftshader/build_vk_swiftshader.sh
@@ -65,6 +65,7 @@
# - Build Vulkan only, don't build GL
# - Don't build samples or tests
cmake -B build-swiftshader/ \
+ -GNinja \
$PLATFORM_ARGS \
-DSWIFTSHADER_BUILD_VULKAN=ON \
-DSWIFTSHADER_BUILD_EGL=OFF \
@@ -75,7 +76,7 @@
third_party/swiftshader/
# Build the project, choosing just the vk_swiftshader target.
-cmake --build build-swiftshader/ --config Release -j 8 --target vk_swiftshader
+cmake --build build-swiftshader/ --config Release --target vk_swiftshader
# Outputs if successful:
# Linux: build-swiftshader/Linux/libvk_swiftshader.so
diff --git a/docs/GetStarted/getting_started_linux_vulkan.md b/docs/GetStarted/getting_started_linux_vulkan.md
index 5416502..557645d 100644
--- a/docs/GetStarted/getting_started_linux_vulkan.md
+++ b/docs/GetStarted/getting_started_linux_vulkan.md
@@ -48,7 +48,7 @@
```shell
# -- CMake --
-$ set VK_LOADER_DEBUG=all
+$ export VK_LOADER_DEBUG=all
$ cmake --build build/ --target iree_hal_vulkan_dynamic_symbols_test
$ ./build/iree/hal/vulkan/iree_hal_vulkan_dynamic_symbols_test
@@ -64,7 +64,7 @@
```shell
# -- CMake --
-$ set VK_LOADER_DEBUG=all
+$ export VK_LOADER_DEBUG=all
$ cmake --build build/ --target iree_hal_cts_device_creation_test
$ ./build/iree/hal/cts/iree_hal_cts_device_creation_test
@@ -112,7 +112,7 @@
loader uses the ICD:
```shell
-$ VK_ICD_FILENAMES=$PWD/build-swiftshader/Linux/vk_swiftshader_icd.json
+$ export VK_ICD_FILENAMES=$PWD/build-swiftshader/Linux/vk_swiftshader_icd.json
```
### Setting up Vulkan-ExtensionLayer
@@ -135,10 +135,10 @@
```shell
# -- CMake --
-$ VK_LAYER_PATH=$PWD/build/third_party/vulkan_extensionlayer/layers/:$VK_LAYER_PATH
+$ export VK_LAYER_PATH=$PWD/build/third_party/vulkan_extensionlayer/layers/:$VK_LAYER_PATH
# -- Bazel --
-$ VK_LAYER_PATH=$PWD/bazel-bin/external/vulkan_extensionlayer/:$VK_LAYER_PATH
+$ export VK_LAYER_PATH=$PWD/bazel-bin/external/vulkan_extensionlayer/:$VK_LAYER_PATH
```
### Support in Bazel Tests
