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

This keeps it in line with upstream dpc++

Author: Colin Davidson

.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/hals/hal_refsi_tutorial/include/device/io_impl.h

@@ -101,8 +101,7 @@ uintptr_t start_dma(void *dst, const void *src, size_t size_in_bytes,
   return xfer_id;
 }
 
-void wait_dma(uintptr_t xfer_id, struct exec_state *state) { /* No-op */
-}
+void wait_dma(uintptr_t xfer_id, struct exec_state *state) { /* No-op */ }
 #endif  // defined(HAL_REFSI_TARGET_M1)
 
 int vsnprint(char *out, size_t n, const char *s, va_list vl) {
@@ -137,8 +136,7 @@ int vsnprint(char *out, size_t n, const char *s, va_list vl) {
             if (++pos < n) out[pos - 1] = '-';
           }
           long digits = 1;
-          for (long nn = num; nn /= 10; digits++)
-            ;
+          for (long nn = num; nn /= 10; digits++);
           for (int i = digits - 1; i >= 0; i--) {
             if (pos + i + 1 < n) out[pos + i] = '0' + (num % 10);
             num /= 10;

examples/refsi/hal_refsi/external/refsidrv/include/common/common_devices.h

@@ -58,9 +58,7 @@ inline unit_kind get_unit_kind(unit_id_t unit_id) {
 
 /// @brief Retrieve the 'index' part of a unit ID. This could be for example the
 /// hart ID if the unit refers to a hart.
-inline uint16_t get_unit_index(unit_id_t unit_id) {
-  return (unit_id & 0xffff);
-}
+inline uint16_t get_unit_index(unit_id_t unit_id) { return (unit_id & 0xffff); }
 
 /// @brief Return a textual representation of the unit ID.
 std::string format_unit(unit_id_t unit_id);
@@ -145,7 +143,7 @@ class MemoryDeviceBase : public MemoryDevice {
 /// device's base address. This base address is used to query the memory
 /// interface for the sub-device which 'lives' at a specified address.
 class MemoryInterface : public MemoryDevice {
-public:
+ public:
   /// @brief Query the memory interface for a device at the given address.
   /// @param addr Address to query for a device.
   /// @param dev_offset On success, offset from the returned device's base
@@ -156,7 +154,7 @@ class MemoryInterface : public MemoryDevice {
 /// @brief Utility class to help manage a set of devices under the same address
 /// space. Devices can be added and removed dynamically.
 class MemoryController : public MemoryInterface {
-public:
+ public:
   /// @brief Create a new memory controller with no sub-devices.
   MemoryController() {}
 
@@ -169,7 +167,7 @@ class MemoryController : public MemoryInterface {
   /// another device is already using the base address.
   /// @param addr Base address of the device, i.e. where it will be mapped.
   /// @param dev Device to add to map in the memory controller.
-  bool add_device(reg_t addr, MemoryDevice* dev);
+  bool add_device(reg_t addr, MemoryDevice *dev);
 
   /// @brief Remove (unmap) a device from the memory controller, given its exact
   /// base address.
@@ -182,10 +180,10 @@ class MemoryController : public MemoryInterface {
   /// region.
   /// @param addr Address to use to locate the device.
   /// @return Pair of (base address, memory device) on success.
-  std::pair<reg_t, MemoryDevice*> find_device(reg_t addr);
+  std::pair<reg_t, MemoryDevice *> find_device(reg_t addr);
 
   /// @brief Return a read-only map of the mapped devices.
-  const std::map<reg_t, MemoryDevice*> & get_devices() { return devices; }
+  const std::map<reg_t, MemoryDevice *> &get_devices() { return devices; }
 
   /// @brief Try to find a device mapped at the given address, which does not
   /// need to be the base address but can point anywhere in the device's memory
@@ -218,7 +216,7 @@ class MemoryController : public MemoryInterface {
   /// be nullptr.
   /// @param unit ID of the execution unit requesting the memory access.
   /// @return true on success and false on failure.
-  bool load(reg_t addr, size_t len, uint8_t* bytes, unit_id_t unit) override;
+  bool load(reg_t addr, size_t len, uint8_t *bytes, unit_id_t unit) override;
 
   /// @brief Try to write data to the device. This is equivalent to calling
   /// @ref find_device followed by @ref store on the returned device,
@@ -228,7 +226,7 @@ class MemoryController : public MemoryInterface {
   /// @param bytes Data to write to the device - must not be nullptr.
   /// @param unit ID of the execution unit requesting the memory access.
   /// @return true on success and false on failure.
-  bool store(reg_t addr, size_t len, const uint8_t* bytes,
+  bool store(reg_t addr, size_t len, const uint8_t *bytes,
              unit_id_t unit) override;
 
   /// @brief Try to copy data from one area of memory to another.
@@ -239,16 +237,14 @@ class MemoryController : public MemoryInterface {
   /// @return true on success and false on failure.
   bool copy(reg_t dst_addr, reg_t src_addr, size_t len, unit_id_t unit);
 
-private:
-  std::map<reg_t, MemoryDevice*> devices;
+ private:
+  std::map<reg_t, MemoryDevice *> devices;
 };
 
 class RAMDevice : public MemoryDeviceBase {
  public:
-  RAMDevice (size_t size);
-  virtual ~RAMDevice() {
-    free(data);
-  }
+  RAMDevice(size_t size);
+  virtual ~RAMDevice() { free(data); }
 
   uint8_t *contents() { return data; }
   size_t mem_size() const override { return size; }
@@ -262,9 +258,7 @@ class RAMDevice : public MemoryDeviceBase {
 
 class ROMDevice : public MemoryDeviceBase {
  public:
-  ROMDevice (size_t size) {
-    data.resize(size);
-  }
+  ROMDevice(size_t size) { data.resize(size); }
 
   uint8_t *contents() { return data.data(); }
   size_t mem_size() const override { return data.size(); }
@@ -280,47 +274,47 @@ class ROMDevice : public MemoryDeviceBase {
 };
 
 class HartLocalDevice : public MemoryDeviceBase {
-public:
+ public:
   HartLocalDevice(size_t size) : size(size) {}
   virtual ~HartLocalDevice();
 
   uint8_t *addr_to_mem(reg_t addr, size_t size, unit_id_t unit_id) override;
 
-  uint8_t* mem_contents(unit_id_t unit_id);
+  uint8_t *mem_contents(unit_id_t unit_id);
   size_t mem_size() const override { return size; }
 
-private:
+ private:
   size_t size;
   std::vector<uint8_t *> hart_contents;
 };
 
 class FileDevice : public MemoryDevice {
-public:
+ public:
   FileDevice(const char *path);
   virtual ~FileDevice();
 
   bool is_open() const { return fd >= 0; }
 
   size_t mem_size() const override;
 
-  bool load(reg_t addr, size_t len, uint8_t* bytes, unit_id_t unit_id) override;
-  bool store(reg_t addr, size_t len, const uint8_t* bytes,
+  bool load(reg_t addr, size_t len, uint8_t *bytes, unit_id_t unit_id) override;
+  bool store(reg_t addr, size_t len, const uint8_t *bytes,
              unit_id_t unit_id) override;
 
-private:
+ private:
   int fd;
 };
 
 class BufferDevice : public MemoryDeviceBase {
-public:
+ public:
   BufferDevice(const void *data, size_t size) : data(data), size(size) {}
 
   size_t mem_size() const override { return size; }
 
   uint8_t *addr_to_mem(reg_t dev_offset, size_t size,
                        unit_id_t unit_id) override;
 
-private:
+ private:
   const void *data;
   size_t size;
 };

examples/refsi/hal_refsi/external/refsidrv/include/common/elf_loader.h

@@ -18,20 +18,16 @@
 #define _REFSIDRV_COMMON_ELF_LOADER_H
 
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
-#include "riscv/devices.h"
 #include "common_devices.h"
 #include "fesvr/elf.h"
+#include "riscv/devices.h"
 
 using symbol_map = std::map<std::string, reg_t>;
 
-enum class elf_machine {
-  unknown = 0,
-  riscv_rv32 = 1,
-  riscv_rv64 = 2
-};
+enum class elf_machine { unknown = 0, riscv_rv32 = 1, riscv_rv64 = 2 };
 
 struct elf_segment {
   uint64_t address;
@@ -41,26 +37,24 @@ struct elf_segment {
 };
 
 class ELFProgram {
-public:
+ public:
   ~ELFProgram();
 
   elf_machine get_machine() const;
 
-  bool read(MemoryDevice &src,
-            unit_id_t unit = make_unit(unit_kind::external));
-  bool load(MemoryDevice &dst,
-            unit_id_t unit = make_unit(unit_kind::external));
+  bool read(MemoryDevice &src, unit_id_t unit = make_unit(unit_kind::external));
+  bool load(MemoryDevice &dst, unit_id_t unit = make_unit(unit_kind::external));
   void clear();
 
-  const std::vector<elf_segment> & get_segments() const { return segments; }
-  const symbol_map & get_symbols() const { return symbols; }
+  const std::vector<elf_segment> &get_segments() const { return segments; }
+  const symbol_map &get_symbols() const { return symbols; }
   uint64_t get_entry_address() const { return entry_address; }
 
   reg_t find_symbol(const char *name) const;
 
   static constexpr uint64_t invalid_address = ~0ull;
 
-private:
+ private:
   bool read_header(MemoryDevice &src, unit_id_t unit);
   bool read_program_header(Elf64_Phdr &program_header, MemoryDevice &src,
                            unit_id_t unit, uint64_t offset);

examples/refsi/hal_refsi/external/refsidrv/include/device/dma_regs.h

@@ -17,33 +17,33 @@
 #ifndef _REFSIDRV_DEVICE_DMA_REGS_H
 #define _REFSIDRV_DEVICE_DMA_REGS_H
 
-#define REFSI_REG_DMACTRL               0x00
-#define REFSI_REG_DMASTARTSEQ           0x01
-#define REFSI_REG_DMADONESEQ            0x02
-#define REFSI_REG_DMASRCADDR            0x03
-#define REFSI_REG_DMADSTADDR            0x04
-#define REFSI_REG_DMAXFERSIZE0          0x05
-#define REFSI_REG_DMAXFERSRCSTRIDE0     0x08
-#define REFSI_REG_DMAXFERDSTSTRIDE0     0x0a
-
-#define REFSI_DMA_REG_ADDR(base, reg)  ((base) + ((reg) << 3))
-#define REFSI_DMA_GET_REG(base, addr)  (((addr) - (base)) >> 3)
-#define REFSI_DMA_NUM_REGS              0x20
-
-#define REFSI_DMA_IO_ADDRESS            0x20002000
-#define REFSI_DMA_IO_END_ADDRESS        0x20002100
-
-#define REFSI_DMA_START                 0x01
-
-#define REFSI_DMA_1D                    0x10
-#define REFSI_DMA_2D                    0x20
-#define REFSI_DMA_3D                    0x30
-#define REFSI_DMA_DIM_MASK              0x30
-
-#define REFSI_DMA_STRIDE_NONE           0x00
-#define REFSI_DMA_STRIDE_DST            0x40
-#define REFSI_DMA_STRIDE_SRC            0x80
-#define REFSI_DMA_STRIDE_BOTH           ((REFSI_DMA_STRIDE_DST) | (REFSI_DMA_STRIDE_SRC))
-#define REFSI_DMA_STRIDE_MODE_MASK      REFSI_DMA_STRIDE_BOTH
-
-#endif // _REFSIDRV_DEVICE_DMA_REGS_H
+#define REFSI_REG_DMACTRL 0x00
+#define REFSI_REG_DMASTARTSEQ 0x01
+#define REFSI_REG_DMADONESEQ 0x02
+#define REFSI_REG_DMASRCADDR 0x03
+#define REFSI_REG_DMADSTADDR 0x04
+#define REFSI_REG_DMAXFERSIZE0 0x05
+#define REFSI_REG_DMAXFERSRCSTRIDE0 0x08
+#define REFSI_REG_DMAXFERDSTSTRIDE0 0x0a
+
+#define REFSI_DMA_REG_ADDR(base, reg) ((base) + ((reg) << 3))
+#define REFSI_DMA_GET_REG(base, addr) (((addr) - (base)) >> 3)
+#define REFSI_DMA_NUM_REGS 0x20
+
+#define REFSI_DMA_IO_ADDRESS 0x20002000
+#define REFSI_DMA_IO_END_ADDRESS 0x20002100
+
+#define REFSI_DMA_START 0x01
+
+#define REFSI_DMA_1D 0x10
+#define REFSI_DMA_2D 0x20
+#define REFSI_DMA_3D 0x30
+#define REFSI_DMA_DIM_MASK 0x30
+
+#define REFSI_DMA_STRIDE_NONE 0x00
+#define REFSI_DMA_STRIDE_DST 0x40
+#define REFSI_DMA_STRIDE_SRC 0x80
+#define REFSI_DMA_STRIDE_BOTH ((REFSI_DMA_STRIDE_DST) | (REFSI_DMA_STRIDE_SRC))
+#define REFSI_DMA_STRIDE_MODE_MASK REFSI_DMA_STRIDE_BOTH
+
+#endif  // _REFSIDRV_DEVICE_DMA_REGS_H

examples/refsi/hal_refsi/external/refsidrv/include/device/host_io_regs.h

@@ -17,8 +17,8 @@
 #ifndef _REFSIDRV_DEVICE_HOST_IO_REGS_H
 #define _REFSIDRV_DEVICE_HOST_IO_REGS_H
 
-#define HOST_IO_CMD_EXIT                0
-#define HOST_IO_CMD_PUTSTRING           1
-#define HOST_IO_CMD_BARRIER             2
+#define HOST_IO_CMD_EXIT 0
+#define HOST_IO_CMD_PUTSTRING 1
+#define HOST_IO_CMD_BARRIER 2
 
-#endif // _REFSIDRV_DEVICE_HOST_IO_REGS_H
+#endif  // _REFSIDRV_DEVICE_HOST_IO_REGS_H