[bazel/ci] Update clang_format in CI to point to Lowrisc toolchain

Generated files also use clang-format, we can call into bazel to use it
from the lowrisc toolchain

Signed-off-by: Drew Macrae <[email protected]>

.clang-format

@@ -1,5 +1,5 @@
-# OpenTitan CI is using clang-format 6.0. The documentation for this
-# configuration is here:
+# OpenTitan CI is using clang-format from the bazel workspace
+# Documentation for this configuration is here:
 #   https://releases.llvm.org/6.0.0/tools/clang/docs/ClangFormatStyleOptions.html
 
 BasedOnStyle: Google

ci/scripts/clang-format.sh

@@ -22,18 +22,8 @@ merge_base="$(git merge-base origin/$tgt_branch HEAD)" || {
 }
 echo "Running C/C++ lint checks on files changed since $merge_base"
 
-TMPFILE="$(mktemp)" || {
-    echo >&2 "Failed to create temporary file"
-    exit 1
-}
-trap 'rm -f "$TMPFILE"' EXIT
+trap 'echo "code failed clang_format_check fix with ./bazelisk.sh run //:clang_format_fix"' ERR
 
 set -o pipefail
-git diff -U0 "$merge_base" -- "*.cpp" "*.cc" "*.c" "*.h" ':!*/vendor/*' | \
-    clang-format-diff -p1 | \
-    tee "$TMPFILE"
-if [ -s "$TMPFILE" ]; then
-    echo -n "##vso[task.logissue type=error]"
-    echo "C/C++ lint failed. Use 'git clang-format' with appropriate options to reformat the changed code."
-    exit 1
-fi
+git diff --name-only "$merge_base" -- "*.cpp" "*.cc" "*.c" "*.h" ':!*/vendor/*' | \
+    xargs ./bazelisk.sh run //:clang_format_check --

doc/rm/c_cpp_coding_style.md

@@ -452,4 +452,4 @@ git add your_modified_file.c
 git clang-format
 ```
 
-To reformat the whole tree the script `util/run-clang-format.sh` can be used.
+To reformat the whole tree the command `./bazelisk.sh run //:clang_format_fix` can be used.

util/autogen_testutils/gen.py

@@ -4,7 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import logging
-import shutil
 import subprocess
 import sys
 from pathlib import Path
@@ -28,11 +27,6 @@ def gen_testutils(ips_with_difs: List[Ip]) -> None:
     Returns:
         None
     """
-    # Check clang-format is installed.
-    assert (shutil.which("clang-format") and
-            "ERROR: clang-format must be installed to format "
-            " autogenerated code to pass OpenTitan CI checks.")
-
     # Sort input so the templates get rendered in the same order every time.
     ips_with_difs.sort(key=lambda ip: ip.name_snake)
 
@@ -43,6 +37,8 @@ def gen_testutils(ips_with_difs: List[Ip]) -> None:
     # Create output directories if needed.
     autogen_testutils_dir.mkdir(exist_ok=True)
 
+    testutilses = []
+
     # Render templates.
     for testutils_template_path in testutils_templates_dir.iterdir():
         if testutils_template_path.suffix == ".tpl":
@@ -56,13 +52,16 @@ def gen_testutils(ips_with_difs: List[Ip]) -> None:
                                           autogen_banner=get_autogen_banner(
                                               "util/autogen_testutils.py",
                                               comment=comment_syntax)))
+            testutilses += [testutils]
 
-            # Format autogenerated file with clang-format.
-            try:
-                subprocess.check_call(["clang-format", "-i", testutils])
-            except subprocess.CalledProcessError:
-                logging.error(
-                    f"failed to format {testutils} with clang-format.")
-                sys.exit(1)
+    # Format autogenerated file with clang-format.
+    try:
+        subprocess.check_call(
+            ["./ci/bazelisk.sh", "run", "//:clang_format_fix", "--"] + testutilses
+        )
+    except subprocess.CalledProcessError:
+        logging.error(
+            f"failed to format {testutilses} with clang-format.")
+        sys.exit(1)
 
-            print(f"testutils successfully written to {str(testutils)}.")
+    print(f"testutils successfully written to {str(testutilses)}.")

util/design/secded_gen.py

@@ -707,8 +707,8 @@ def format_c_files(c_src_filename, c_h_filename):
     try:
         # Call clang-format to in-place format generated C code. If there are
         # any issues log a warning.
-        result = subprocess.run(['clang-format', '-i', c_src_filename,
-                                c_h_filename], stderr=subprocess.PIPE,
+        result = subprocess.run(['./ci/bazelisk.sh', 'run', '//:clang_format_fix', '--',
+                                c_src_filename, c_h_filename], stderr=subprocess.PIPE,
                                 universal_newlines=True)
         result.check_returncode()
     except Exception as e:

util/make_new_dif.py

@@ -37,7 +37,6 @@
 import argparse
 import glob
 import logging
-import shutil
 import subprocess
 import sys
 from pathlib import Path
@@ -151,6 +150,7 @@ def main():
                 str(header_out_file)))
 
         if "autogen" in args.only:
+            out_files = []
             # Render all templates
             for filetype in [".h", ".c", "_unittest.cc"]:
                 # Build input/output file names.
@@ -172,19 +172,21 @@ def main():
                             "util/make_new_dif.py --mode=regen --only=autogen",
                             "//")))
 
-                # Format autogenerated file with clang-format.
-                assert (shutil.which("clang-format") and
-                        "ERROR: clang-format must be installed to format "
-                        " autogenerated code to pass OpenTitan CI checks.")
-                try:
-                    subprocess.check_call(["clang-format", "-i", out_file])
-                except subprocess.CalledProcessError:
-                    logging.error(
-                        f"failed to format {out_file} with clang-format.")
-                    sys.exit(1)
-
-                print("Autogenerated DIF successfully written to {}.".format(
-                    out_file))
+                # Assemble a list of files to format all at once
+                out_files += [out_file]
+
+        # Format autogenerated file with clang-format.
+        try:
+            subprocess.check_call(
+                ["./ci/bazelisk.sh", "run", "//:clang_format_fix", "--"] + out_files
+            )
+        except subprocess.CalledProcessError:
+            logging.error(
+                f"failed to format {out_file} with clang-format.")
+            sys.exit(1)
+
+        print("Autogenerated DIF successfully written to {}.".format(
+            out_files))
 
         if "checklist" in args.only:
             checklist_template_file = REPO_TOP / "doc/project/sw_checklist.md.tpl"