build - register exact names of backends in CeedRegister_Weak for better error messages

Author: jeremylt

backends/ceed-backend-list.h

@@ -5,24 +5,24 @@
 // listed, and also to define weak symbol aliases for backends that are not
 // configured.
 
-MACRO(CeedRegister_Avx_Blocked)
-MACRO(CeedRegister_Avx_Serial)
-MACRO(CeedRegister_Cuda)
-MACRO(CeedRegister_Cuda_Gen)
-MACRO(CeedRegister_Cuda_Shared)
-MACRO(CeedRegister_Hip)
-MACRO(CeedRegister_Hip_Gen)
-MACRO(CeedRegister_Hip_Shared)
-MACRO(CeedRegister_Magma)
-MACRO(CeedRegister_Magma_Det)
-MACRO(CeedRegister_Memcheck_Blocked)
-MACRO(CeedRegister_Memcheck_Serial)
-MACRO(CeedRegister_Occa)
-MACRO(CeedRegister_Opt_Blocked)
-MACRO(CeedRegister_Opt_Serial)
-MACRO(CeedRegister_Ref)
-MACRO(CeedRegister_Ref_Blocked)
-MACRO(CeedRegister_Tmpl)
-MACRO(CeedRegister_Tmpl_Sub)
-MACRO(CeedRegister_Xsmm_Blocked)
-MACRO(CeedRegister_Xsmm_Serial)
+MACRO(CeedRegister_Avx_Blocked, 1, "/cpu/self/avx/blocked")
+MACRO(CeedRegister_Avx_Serial, 1, "/cpu/self/avx/serial")
+MACRO(CeedRegister_Cuda, 1, "/gpu/cuda/ref")
+MACRO(CeedRegister_Cuda_Gen, 1, "/gpu/cuda/gen")
+MACRO(CeedRegister_Cuda_Shared, 1, "/gpu/cuda/shared")
+MACRO(CeedRegister_Hip, 1, "/gpu/hip/ref")
+MACRO(CeedRegister_Hip_Gen, 1, "/gpu/hip/gen")
+MACRO(CeedRegister_Hip_Shared, 1, "/gpu/hip/shared")
+MACRO(CeedRegister_Magma, 2, "/gpu/cuda/magma", "/gpu/hip/magma")
+MACRO(CeedRegister_Magma_Det, 2, "/gpu/cuda/magma/det", "/gpu/hip/magma/det")
+MACRO(CeedRegister_Memcheck_Blocked, 1, "/cpu/self/memcheck/blocked")
+MACRO(CeedRegister_Memcheck_Serial, 1, "/cpu/self/memcheck/serial")
+MACRO(CeedRegister_Occa, 4, "/cpu/self/occa", "/cpu/openmp/occa", "/gpu/hip/occa", "/gpu/cuda/occa")
+MACRO(CeedRegister_Opt_Blocked, 1, "/cpu/self/opt/blocked")
+MACRO(CeedRegister_Opt_Serial, 1, "/cpu/self/opt/serial")
+MACRO(CeedRegister_Ref, 1, "/cpu/self/ref/serial")
+MACRO(CeedRegister_Ref_Blocked, 1, "/cpu/self/ref/blocked")
+MACRO(CeedRegister_Tmpl, 1, "/cpu/self/tmpl")
+MACRO(CeedRegister_Tmpl_Sub, 1, "/cpu/self/tmpl/sub")
+MACRO(CeedRegister_Xsmm_Blocked, 1, "/cpu/self/xsmm/blocked")
+MACRO(CeedRegister_Xsmm_Serial, 1, "/cpu/self/xsmm/serial")

backends/ceed-backend-weak.c

@@ -1,17 +1,33 @@
 #include <ceed/backend.h>
+#include <limits.h>
 #include <stdlib.h>
 #include <stdio.h>
 
-// This function provides a debug target for weak symbols
 // LCOV_EXCL_START
-static int CeedRegister_Weak(const char *name) {
+// This function provides improved error messages for uncompiled backends
+static int CeedInit_Weak(const char *resource, Ceed ceed) {
+  return CeedError(ceed, CEED_ERROR_UNSUPPORTED,
+                   "Backend not currently compiled: %s", resource);
+}
+
+// This function provides a debug target for weak symbols
+static int CeedRegister_Weak(const char *name, int num_prefixes, ...) {
   if (getenv("CEED_DEBUG")) fprintf(stderr, "Weak %s\n", name);
+
+  va_list prefixes;
+  va_start(prefixes, num_prefixes);
+  int ierr;
+  for (int i=0; i<num_prefixes; i++) {
+    ierr = CeedRegister(va_arg(prefixes, const char*), CeedInit_Weak, UINT_MAX);
+    CeedChk(ierr);
+  }
+  va_end(prefixes);
   return CEED_ERROR_SUCCESS;
 }
 // LCOV_EXCL_STOP
 
-#define MACRO(name)                                                     \
+#define MACRO(name,num_prefixes, ...)                                                     \
   CEED_INTERN int name(void) __attribute__((weak));                     \
-  int name(void) { return CeedRegister_Weak(__func__); }
+  int name(void) { return CeedRegister_Weak(__func__,num_prefixes, ## __VA_ARGS__); }
 #include "ceed-backend-list.h"
 #undef MACRO

interface/ceed-register.c

@@ -6,7 +6,7 @@
 
 static bool register_all_called;
 
-#define MACRO(name) CEED_INTERN int name(void);
+#define MACRO(name,...) CEED_INTERN int name(void);
 #include "../backends/ceed-backend-list.h"
 #undef MACRO
 
@@ -26,7 +26,7 @@ int CeedRegisterAll() {
   if (register_all_called) return 0;
   register_all_called = true;
 
-#define MACRO(name) CeedChk(name());
+#define MACRO(name,...) CeedChk(name());
 #include "../backends/ceed-backend-list.h"
 #undef MACRO
   return CEED_ERROR_SUCCESS;