Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ utils_cxi_dump_csrs_SOURCES = utils/cxi_dump_csrs.c
utils_cxi_dump_csrs_LDADD = src/libcxi.la
utils/cxi_dump_csrs.c: utils/cxi_dump_csrs.h
utils/cxi_dump_csrs.h: utils/cxi_dump_csrs.py
utils/cxi_dump_csrs.py > utils/cxi_dump_csrs.h
CASSINI_CSR_DEFS=$(cassinicsrdefs) utils/cxi_dump_csrs.py > utils/cxi_dump_csrs.h

utils_MANS = \
man/man1/cxi_atomic_bw.1 \
Expand Down
8 changes: 8 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,13 @@ AS_IF([test -d $withval],
AC_CHECK_DECL(HAVE_HIP_SUPPORT, [], [LDFLAGS="$LDFLAGS -ldl"], []),
[AC_MSG_RESULT([No CUDA])])

AC_ARG_WITH([cassini-csr_defs],
[AS_HELP_STRING([--with-cassini-csr_defs=PATH], [Path to csr_defs.json])],
[cassinicsrdefs="$withval"],
[cassinicsrdefs="/usr/share/cassini-headers/csr_defs.json"])

AC_SUBST([cassinicsrdefs])

AC_ARG_ENABLE([asan],
[AS_HELP_STRING([--enable-asan],
[Enable address sanitizer @<:@default=no@:>@])
Expand Down Expand Up @@ -205,6 +212,7 @@ AC_MSG_RESULT([
includedir: ${includedir}
systemdunitdir: ${systemdsystemunitdir}
udevrulesdir: ${udevrulesdir}
cassinicsrdefs: ${cassinicsrdefs}

compiler: ${CC}
cflags: ${CFLAGS}
Expand Down
10 changes: 6 additions & 4 deletions utils/cxi_dump_csrs.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@
"""

import json
import os

json_path = os.environ.get("CASSINI_CSR_DEFS", "/usr/share/cassini-headers/csr_defs.json")

try:
with open('/usr/share/cassini-headers/csr_defs.json', 'r') as f:
csrdefs = json.load(f)
except FileNotFoundError:
with open('../cassini-headers/install/share/cassini-headers/csr_defs.json', 'r') as f:
with open(json_path, 'r') as f:
csrdefs = json.load(f)
except FileNotFoundError as e:
raise RuntimeError(f"CSR defs file not found at '{json_path}'. Set CASSINI_CSR_DEFS to override.") from e

print("/* Autogenerated file. Do not modify. */")

Expand Down