[CI][CLANG-FORMAT] Switch to clang-20-format

This keeps it in line with upstream dpc++

Author: Colin Davidson

.clang-format

@@ -1,19 +1,2 @@
 ---
-Language:        Cpp
-BasedOnStyle:  Google
-Standard: Cpp11
-IncludeBlocks:   Regroup
-IncludeCategories:
-  - Regex:           '^<.*\.(h|hpp)>'
-    Priority:        1
-  - Regex:           '^<.*'
-    Priority:        2
-  - Regex:           '.*'
-    Priority:        3
-DerivePointerAlignment: false
-QualifierAlignment: Left
-PointerAlignment: Right
-Macros:
-  - CL_LAMBDA_CALLBACK=[[]]
-  - VK_LAMBDA_CALLBACK=[[]]
-...
+BasedOnStyle: LLVM

.github/workflows/run_ock_internal_tests.yml

@@ -172,11 +172,11 @@ jobs:
 
       - name: setup-ubuntu-clang-format
         run:
-          pip install clang-format==19.1.0
+          pip install clang-format==20.1.0
 
       - name: run clang-format
         run: |
-          # we've installed clang-format-19 in the docker via pip, which just installs it as clang-format,
+          # we've installed clang-format-20 in the docker via pip, which just installs it as clang-format,
           # so just use clang-format-diff and -b clang-format directly
           git fetch origin ${{ github.base_ref }}
           git diff --no-color origin/${{ github.base_ref }} | \

CMakeLists.txt

@@ -197,7 +197,12 @@ find_package(PythonInterp 3.6 REQUIRED)
 # which perform static analysis and style checking on source files.
 # When updating the version here, also update that used in the merge request
 # config
-find_package(ClangTools 19 COMPONENTS clang-format clang-tidy)
+find_package(ClangTools 19 COMPONENTS clang-tidy)
+if(TARGET ClangTools::clang-tidy)
+  ca_option(CA_CLANG_TIDY_FLAGS STRING
+    "Semi-color separated list of clang-tidy flags" "")
+endif()
+find_package(ClangTools 20 COMPONENTS clang-format)
 if(TARGET ClangTools::clang-tidy)
   ca_option(CA_CLANG_TIDY_FLAGS STRING
     "Semi-color separated list of clang-tidy flags" "")

README.md

@@ -45,13 +45,13 @@ To install the dependencies on Ubuntu, open the terminal and run:
 
 ### Recommended packages
 * [Ninja](https://ninja-build.org/)
-* [clang-format](https://clang.llvm.org/docs/ClangFormat.html) 16
+* [clang-format](https://clang.llvm.org/docs/ClangFormat.html) 20
 * [lit](https://llvm.org/docs/CommandGuide/lit.html)
 
 To install the recommended packages, run:
 ```sh
    $ sudo apt install -y ninja-build doxygen python3-pip
-   $ sudo pip3 install lit virtualenv cmakelint clang-format==19.1.0
+   $ sudo pip3 install lit virtualenv cmakelint clang-format==20.1.0
 ```
 
 ### Compiling oneAPI Construction Kit

clik/external/hal_cpu/include/device/kernel_if.h

@@ -83,7 +83,6 @@ static uintptr_t start_dma(void *dst, const void *src, size_t size_in_bytes,
   return xfer_id;
 }
 
-static void wait_dma(uintptr_t xfer_id, struct exec_state *e) { /* No-op */
-}
+static void wait_dma(uintptr_t xfer_id, struct exec_state *e) { /* No-op */ }
 
 #endif  // _HAL_CPU_KERNEL_IF_H

clik/external/hal_cpu/source/hal_main.cpp

@@ -57,7 +57,7 @@ class cpu_hal_platform : public hal::hal_t {
 
   cpu_hal_platform() {
     hal_device_info = &cpu_hal::setup_cpu_hal_device_info();
- 
+
     static constexpr uint32_t implemented_api_version = 6;
     static_assert(implemented_api_version == hal_t::api_version,
                   "Implemented API version for CPU HAL does not match hal.h");

examples/applications/simple-vector-add.cpp

@@ -36,8 +36,7 @@ constexpr sycl::access::mode sycl_write = sycl::access::mode::write;
 
 /* This is the class used to name the kernel for the runtime.
  * This must be done when the kernel is expressed as a lambda. */
-template <typename T>
-class SimpleVadd;
+template <typename T> class SimpleVadd;
 
 template <typename T, size_t N>
 void simple_vadd(const std::array<T, N> &VA, const std::array<T, N> &VB,

examples/applications/vector_addition-tiled-load-store.cpp

@@ -40,8 +40,8 @@ void storeTile(float *c, float *tile1, size_t id, size_t tile_i) {
 
 class tiled_vec_add;
 int main(int argc, char *argv[]) {
-  constexpr const size_t N = 128000;  // this is the total vector size
-  constexpr const size_t T = 32;      // this is the tile size
+  constexpr const size_t N = 128000; // this is the total vector size
+  constexpr const size_t T = 32;     // this is the tile size
   const sycl::range<1> VecSize{N};
   const sycl::range<1> tile_size(T);
 

examples/hal_cpu_remote_server/hal_cpu_executable.cpp

@@ -55,20 +55,20 @@ int main(int argc, char **argv) {
 
   for (;;) {
     switch (auto opt = getopt(argc, argv, "n:h")) {
-      case 'n':
-        node = optarg;
-        continue;
-
-      case 'h':
-        print_usage(std::cout, argv[0]);
-        exit(0);
-      default:
-        std::cerr << "Error: Unexpected options '" << (char)opt << "'\n";
-        print_usage(std::cerr, argv[0]);
-        exit(1);
-
-      case -1:
-        break;
+    case 'n':
+      node = optarg;
+      continue;
+
+    case 'h':
+      print_usage(std::cout, argv[0]);
+      exit(0);
+    default:
+      std::cerr << "Error: Unexpected options '" << (char)opt << "'\n";
+      print_usage(std::cerr, argv[0]);
+      exit(1);
+
+    case -1:
+      break;
     }
 
     break;

examples/hals/hal_cpu_client/source/hal_main.cpp

@@ -19,7 +19,7 @@
 
 namespace hal {
 class hal_cpu_socket_client : public hal::hal_socket_client {
- public:
+public:
   hal_cpu_socket_client() : hal_socket_client(0) {
     static constexpr uint32_t implemented_api_version = 6;
     static_assert(
@@ -44,7 +44,7 @@ class hal_cpu_socket_client : public hal::hal_socket_client {
     return hal_device_info;
   }
 };
-}  // namespace hal
+} // namespace hal
 static hal::hal_cpu_socket_client hal_object;
 
 hal::hal_t *get_hal(uint32_t &api_version) {