From a4b8ccbe1139d90b1c9ec15d6b4df41c5016a72f Mon Sep 17 00:00:00 2001 From: Jacques Pienaar Date: Wed, 8 Nov 2023 09:55:22 -0800 Subject: [PATCH] Update github branch names etc (NFC) (#15482) Outdated branch names given renaming. --- build_tools/bazel/build_core.sh | 4 ++-- build_tools/bazel/iree.bazelrc | 2 +- .../bazel_to_cmake/bazel_to_cmake_converter.py | 2 +- .../HAL/Target/LLVMCPU/internal/WasmLinkerTool.cpp | 2 +- .../compiler/Dialect/Vulkan/IR/VulkanAttributes.td | 2 +- compiler/src/iree/compiler/Tools/iree_compile_lib.cc | 2 +- docs/api_docs/python/index.rst | 2 +- docs/website/docs/building-from-source/riscv.md | 8 ++++---- .../docs/developers/building/cmake-options.md | 2 +- .../developers/performance/profiling-cpu-events.md | 2 +- .../docs/developers/vulkan-environment-setup.md | 12 ++++++------ runtime/src/iree/base/internal/fpu_state.c | 2 +- runtime/src/iree/base/internal/synchronization.h | 2 +- samples/colab/README.md | 2 +- samples/colab/dummy.py | 5 ----- tools/android/run_module_app/README.md | 2 +- 16 files changed, 24 insertions(+), 29 deletions(-) delete mode 100644 samples/colab/dummy.py diff --git a/build_tools/bazel/build_core.sh b/build_tools/bazel/build_core.sh index 8f30d6496482..4df8f2c33627 100755 --- a/build_tools/bazel/build_core.sh +++ b/build_tools/bazel/build_core.sh @@ -13,11 +13,11 @@ # set. # IREE_VULKAN_DISABLE: Do not run tests that require Vulkan. Default: 0 # BUILD_TAG_FILTERS: Passed to bazel to filter targets to build. -# See https://docs.bazel.build/versions/master/command-line-reference.html#flag--build_tag_filters) +# See https://bazel.build/reference/command-line-reference.html#flag--build_tag_filters) # Default: "-nokokoro" # TEST_TAG_FILTERS: Passed to bazel to filter targets to test. Note that test # targets excluded this way will also not be built. -# See https://docs.bazel.build/versions/master/command-line-reference.html#flag--test_tag_filters) +# See https://bazel.build/reference/command-line-reference.html#flag--test_tag_filters) # Default: If IREE_VULKAN_DISABLE=1, "-nokokoro,-driver=vulkan". Else "-nokokoro". set -xeuo pipefail diff --git a/build_tools/bazel/iree.bazelrc b/build_tools/bazel/iree.bazelrc index 1b9920e9d3e2..e0643e70200d 100644 --- a/build_tools/bazel/iree.bazelrc +++ b/build_tools/bazel/iree.bazelrc @@ -23,7 +23,7 @@ test --test_output=errors # Enables unix-style runfiles link trees on Windows. Requires enabling symlink # permissions: Enable Developer Mode in the Developer Settings page of the # system settings. See -# https://docs.bazel.build/versions/master/windows.html#enable-symlink-support +# https://bazel.build/configure/windows#enable-symlink-support # and https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10/ startup --windows_enable_symlinks build --enable_runfiles diff --git a/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py b/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py index fec440d0e4a6..841047363f35 100644 --- a/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py +++ b/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py @@ -343,7 +343,7 @@ def glob(self, include, exclude=None, exclude_directories=1): # bazel's glob has some specific restrictions about crossing package # boundaries. We have no uses of recursive globs. Rather than try to # emulate them or silently give different behavior, just error out. - # See https://docs.bazel.build/versions/master/be/functions.html#glob + # See https://bazel.build/reference/be/functions.html#glob raise NotImplementedError("Recursive globs not supported") # Bazel `*.mlir` glob -> CMake Variable `_GLOB_X_MLIR` var = "_GLOB_" + pattern.replace("*", "X").replace(".", "_").upper() diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVMCPU/internal/WasmLinkerTool.cpp b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVMCPU/internal/WasmLinkerTool.cpp index c21fb05792ed..75892a83e3f7 100644 --- a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVMCPU/internal/WasmLinkerTool.cpp +++ b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVMCPU/internal/WasmLinkerTool.cpp @@ -23,7 +23,7 @@ namespace HAL { // // For details on the linking process and file formats, see: // * https://lld.llvm.org/WebAssembly.html -// * https://github.com/WebAssembly/tool-conventions/blob/master/Linking.md +// * https://github.com/WebAssembly/tool-conventions/blob/main/Linking.md // // For more background on WebAssembly, see: // * https://webassembly.org/ diff --git a/compiler/src/iree/compiler/Dialect/Vulkan/IR/VulkanAttributes.td b/compiler/src/iree/compiler/Dialect/Vulkan/IR/VulkanAttributes.td index 61eda119ca9d..413dfac1e093 100644 --- a/compiler/src/iree/compiler/Dialect/Vulkan/IR/VulkanAttributes.td +++ b/compiler/src/iree/compiler/Dialect/Vulkan/IR/VulkanAttributes.td @@ -36,7 +36,7 @@ def VK_CooperativeMatrixPropertiesKHRAttr : // TODO(antiagainst): consider auto-generating this file (or part of it) from // vk.xml: -// https://raw.githubusercontent.com/KhronosGroup/Vulkan-Docs/master/xml/vk.xml +// https://raw.githubusercontent.com/KhronosGroup/Vulkan-Docs/main/xml/vk.xml // Dictionary attribute containing various Vulkan capability bits. This is // aggregated from various Vulkan properties, limits, features from the spec. diff --git a/compiler/src/iree/compiler/Tools/iree_compile_lib.cc b/compiler/src/iree/compiler/Tools/iree_compile_lib.cc index a2592518b0e6..ba1bcf3a0dc6 100644 --- a/compiler/src/iree/compiler/Tools/iree_compile_lib.cc +++ b/compiler/src/iree/compiler/Tools/iree_compile_lib.cc @@ -78,7 +78,7 @@ int mlir::iree_compiler::runIreecMain(int argc, char **argv) { "o", llvm::cl::desc("Output filename"), llvm::cl::value_desc("filename"), llvm::cl::init("-"), llvm::cl::cat(mainOptions)); - // The output format flag is the master control for what we do with the + // The output format flag is the primary control for what we do with the // in-memory compiled form. llvm::cl::opt outputFormat( "output-format", llvm::cl::desc("Format of compiled output"), diff --git a/docs/api_docs/python/index.rst b/docs/api_docs/python/index.rst index 20478cbf3d5d..cf23858d8830 100644 --- a/docs/api_docs/python/index.rst +++ b/docs/api_docs/python/index.rst @@ -1,4 +1,4 @@ -.. IREE Python API documentation master file, created by +.. IREE Python API documentation main file, created by sphinx-quickstart on Sat Sep 25 16:59:09 2021. You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. diff --git a/docs/website/docs/building-from-source/riscv.md b/docs/website/docs/building-from-source/riscv.md index a9a9d6e2d62a..b9be8e1ad9fb 100644 --- a/docs/website/docs/building-from-source/riscv.md +++ b/docs/website/docs/building-from-source/riscv.md @@ -143,13 +143,13 @@ ${QEMU_BIN} \ toolchain and the emulator, build the tools from the following sources: * RISC-V toolchain is built from - (main branch). +. * Currently, the LLVM compiler is built on GNU toolchain, including libgcc, GNU linker, and C libraries. You need to build GNU toolchain first. * Clone GNU toolchain from: - - (master branch). Switch the "riscv-binutils" submodule to - `git://sourceware.org/git/binutils-gdb.git` (master branch) manually. + . + Switch the "riscv-binutils" submodule to + `git://sourceware.org/git/binutils-gdb.git` manually. * RISC-V QEMU is built from . diff --git a/docs/website/docs/developers/building/cmake-options.md b/docs/website/docs/developers/building/cmake-options.md index 2c6d007f9bff..c144c3da9e02 100644 --- a/docs/website/docs/developers/building/cmake-options.md +++ b/docs/website/docs/developers/building/cmake-options.md @@ -170,7 +170,7 @@ if the current build type is Debug and the compiler supports it. ## Cross-compilation When cross compiling (using a toolchain file like -[`android.toolchain.cmake`](https://android.googlesource.com/platform/ndk/+/master/build/cmake/android.toolchain.cmake)), +[`android.toolchain.cmake`](https://android.googlesource.com/platform/ndk/+/main/build/cmake/android.toolchain.cmake)), first build and install IREE's tools for your host configuration, then use the `IREE_HOST_BIN_DIR` CMake option to point the cross compiled build at the host tools. diff --git a/docs/website/docs/developers/performance/profiling-cpu-events.md b/docs/website/docs/developers/performance/profiling-cpu-events.md index 892217bd4436..79c23e0490e2 100644 --- a/docs/website/docs/developers/performance/profiling-cpu-events.md +++ b/docs/website/docs/developers/performance/profiling-cpu-events.md @@ -185,7 +185,7 @@ adb shell simpleperf list There is no `simpleperf annotate`. The `simpleperf` documentation lists a couple of -[ways](https://android.googlesource.com/platform/system/extras/+/master/simpleperf/doc/README.md#show-annotated-source-code-and-disassembly) +[ways](https://android.googlesource.com/platform/system/extras/+/main/simpleperf/doc/README.md#show-annotated-source-code-and-disassembly) of achieving the same thing. However: diff --git a/docs/website/docs/developers/vulkan-environment-setup.md b/docs/website/docs/developers/vulkan-environment-setup.md index 36c76ebf896a..68a8f0cc35f5 100644 --- a/docs/website/docs/developers/vulkan-environment-setup.md +++ b/docs/website/docs/developers/vulkan-environment-setup.md @@ -207,12 +207,12 @@ display at the server side, for example: export DISPLAY=:0 ``` -[VulkanArchOverview]: https://github.com/KhronosGroup/Vulkan-Loader/blob/master/loader/LoaderAndLayerInterface.md#overview -[VulkanArchPicture]: https://raw.githubusercontent.com/KhronosGroup/Vulkan-Loader/master/docs/images/high_level_loader.png -[VulkanICD]: https://github.com/KhronosGroup/Vulkan-Loader/blob/master/loader/LoaderAndLayerInterface.md#installable-client-drivers -[VulkanLayer]: https://github.com/KhronosGroup/Vulkan-Loader/blob/master/loader/LoaderAndLayerInterface.md#layers -[VulkanLoader]: https://github.com/KhronosGroup/Vulkan-Loader/blob/master/loader/LoaderAndLayerInterface.md#the-loader -[VulkanLoaderEnvVars]: https://github.com/KhronosGroup/Vulkan-Loader/blob/master/loader/LoaderAndLayerInterface.md#table-of-debug-environment-variables +[VulkanArchOverview]: https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderInterfaceArchitecture.md#overview +[VulkanArchPicture]: https://raw.githubusercontent.com/KhronosGroup/Vulkan-Loader/main/docs/images/high_level_loader.png +[VulkanICD]: https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderInterfaceArchitecture.md#installable-client-drivers +[VulkanLayer]: https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderInterfaceArchitecture.md#layers +[VulkanLoader]: https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderInterfaceArchitecture.md#the-loader +[VulkanLoaderEnvVars]: https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderInterfaceArchitecture.md#table-of-debug-environment-variables [VulkanLoaderSource]: https://github.com/KhronosGroup/Vulkan-Loader [VulkanSDK]: https://www.lunarg.com/vulkan-sdk/ [VulkanValidationLayersSource]: https://github.com/KhronosGroup/Vulkan-ValidationLayers diff --git a/runtime/src/iree/base/internal/fpu_state.c b/runtime/src/iree/base/internal/fpu_state.c index 6ec80b302f1d..049c968ad207 100644 --- a/runtime/src/iree/base/internal/fpu_state.c +++ b/runtime/src/iree/base/internal/fpu_state.c @@ -20,7 +20,7 @@ // iree_fpu_state_t //============================================================================== // https://github.com/petewarden/tensorflow_makefile/blob/master/tensorflow/core/platform/denormal.cc -// https://chromium.googlesource.com/chromium/blink/+/master/Source/platform/audio/DenormalDisabler.h +// https://chromium.googlesource.com/chromium/blink/+/main/Source/platform/audio/DenormalDisabler.h static uint64_t iree_fpu_state_set_dtz(uint64_t state, bool denormals_to_zero); diff --git a/runtime/src/iree/base/internal/synchronization.h b/runtime/src/iree/base/internal/synchronization.h index 0db86d275476..e26b9b4484fa 100644 --- a/runtime/src/iree/base/internal/synchronization.h +++ b/runtime/src/iree/base/internal/synchronization.h @@ -339,7 +339,7 @@ void iree_slim_mutex_unlock(iree_slim_mutex_t* mutex) // http://www.1024cores.net/home/lock-free-algorithms/eventcounts // https://software.intel.com/en-us/forums/intel-threading-building-blocks/topic/299245 // https://github.com/r10a/Event-Counts -// https://github.com/facebook/folly/blob/master/folly/experimental/EventCount.h +// https://github.com/facebook/folly/blob/main/folly/experimental/EventCount.h // https://github.com/concurrencykit/ck/blob/master/include/ck_ec.h typedef struct iree_notification_t { #if IREE_SYNCHRONIZATION_DISABLE_UNSAFE diff --git a/samples/colab/README.md b/samples/colab/README.md index aa1896a2b84a..f4c524a62db9 100644 --- a/samples/colab/README.md +++ b/samples/colab/README.md @@ -19,7 +19,7 @@ TFLite | [tflite_text_classification](tflite_text_classification.ipynb) | Compil ## Working with GitHub Refer to -[Colab's GitHub demo](https://colab.research.google.com/github/googlecolab/colabtools/blob/master/notebooks/colab-github-demo.ipynb) +[Colab's GitHub demo](https://colab.research.google.com/github/googlecolab/colabtools/blob/main/notebooks/colab-github-demo.ipynb) for general information about using Colab with GitHub. To make changes to a notebook in this repository, one possible workflow is: diff --git a/samples/colab/dummy.py b/samples/colab/dummy.py deleted file mode 100644 index e457cb5853cf..000000000000 --- a/samples/colab/dummy.py +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2019 The IREE Authors -# -# Licensed under the Apache License v2.0 with LLVM Exceptions. -# See https://llvm.org/LICENSE.txt for license information. -# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception diff --git a/tools/android/run_module_app/README.md b/tools/android/run_module_app/README.md index 9f7ae4d26b3d..6b7dfaa0c529 100644 --- a/tools/android/run_module_app/README.md +++ b/tools/android/run_module_app/README.md @@ -57,5 +57,5 @@ When started on Android, the app will read the contents in `assets` to get the VM FlatBuffer and invocation information and run it. [native-activity]: https://developer.android.com/reference/android/app/NativeActivity -[native-activity-example]: https://github.com/android/ndk-samples/tree/master/native-activity +[native-activity-example]: https://github.com/android/ndk-samples/tree/main/native-activity [native-activity-tutorial]: https://medium.com/androiddevelopers/getting-started-with-c-and-android-native-activities-2213b402ffff