backends - use defines over weak

Author: jeremylt

Makefile

@@ -487,9 +487,10 @@ MEMCHK_STATUS   = Disabled
 MEMCHK         := $(shell echo "$(HASH)include <valgrind/memcheck.h>" | $(CC) $(CPPFLAGS) -E - >/dev/null 2>&1 && echo 1)
 MEMCHK_BACKENDS = /cpu/self/memcheck/serial /cpu/self/memcheck/blocked
 ifeq ($(MEMCHK),1)
-  MEMCHK_STATUS = Enabled
-  libceed.c += $(ceedmemcheck.c)
+  MEMCHK_STATUS  = Enabled
+  libceed.c     += $(ceedmemcheck.c)
   BACKENDS_MAKE += $(MEMCHK_BACKENDS)
+  CFLAGS        += "-DCEED_USE_MEMCHECK"
 endif
 
 # AVX Backeds
@@ -498,9 +499,10 @@ AVX_FLAG    := $(if $(filter clang,$(CC_VENDOR)),+avx,-mavx)
 AVX         := $(filter $(AVX_FLAG),$(shell $(CC) $(CFLAGS:-M%=) -v -E -x c /dev/null 2>&1))
 AVX_BACKENDS = /cpu/self/avx/serial /cpu/self/avx/blocked
 ifneq ($(AVX),)
-  AVX_STATUS = Enabled
-  libceed.c += $(avx.c)
+  AVX_STATUS     = Enabled
+  libceed.c     += $(avx.c)
   BACKENDS_MAKE += $(AVX_BACKENDS)
+  CFLAGS        += "-DCEED_USE_AVX"
 endif
 
 # Collect list of libraries and paths for use in linking and pkg-config
@@ -523,10 +525,11 @@ ifneq ($(wildcard $(XSMM_DIR)/lib/libxsmm.*),)
     endif
     BLAS_LIB ?= $(MKL_LINK) -Wl,--push-state,--no-as-needed -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl -Wl,--pop-state
   endif
-  PKG_LIBS += $(BLAS_LIB)
+  PKG_LIBS  += $(BLAS_LIB)
   libceed.c += $(xsmm.c)
   $(xsmm.c:%.c=$(OBJDIR)/%.o) $(xsmm.c:%=%.tidy) : CPPFLAGS += -I$(XSMM_DIR)/include
   BACKENDS_MAKE += $(XSMM_BACKENDS)
+  CFLAGS        += "-DCEED_USE_XSMM"
 endif
 
 # CUDA Backends
@@ -538,14 +541,15 @@ CUDA_LIB_DIR_STUBS := $(CUDA_LIB_DIR)/stubs
 CUDA_BACKENDS = /gpu/cuda/ref /gpu/cuda/shared /gpu/cuda/gen
 ifneq ($(CUDA_LIB_DIR),)
   $(libceeds) : CPPFLAGS += -I$(CUDA_DIR)/include
-  PKG_LIBS += -L$(abspath $(CUDA_LIB_DIR)) -lcudart -lnvrtc -lcuda -lcublas
+  PKG_LIBS       += -L$(abspath $(CUDA_LIB_DIR)) -lcudart -lnvrtc -lcuda -lcublas
   PKG_STUBS_LIBS += -L$(CUDA_LIB_DIR_STUBS)
   LIBCEED_CONTAINS_CXX = 1
   libceed.c     += interface/ceed-cuda.c
   libceed.c     += $(cuda-all.c)
   libceed.cpp   += $(cuda-all.cpp)
   libceed.cu    += $(cuda-all.cu)
   BACKENDS_MAKE += $(CUDA_BACKENDS)
+  CFLAGS        += "-DCEED_USE_CUDA"
 endif
 
 # HIP Backends
@@ -564,6 +568,7 @@ ifneq ($(HIP_LIB_DIR),)
   libceed.cpp   += $(hip-all.cpp)
   libceed.hip   += $(hip-all.hip)
   BACKENDS_MAKE += $(HIP_BACKENDS)
+  CFLAGS        += "-DCEED_USE_HIP"
 endif
 
 # SYCL Backends
@@ -577,6 +582,7 @@ ifneq ($(SYCL_LIB_DIR),)
   LIBCEED_CONTAINS_CXX = 1
   libceed.sycl  += $(sycl-core.cpp) $(sycl-ref.cpp) $(sycl-shared.cpp) $(sycl-gen.cpp)
   BACKENDS_MAKE += $(SYCL_BACKENDS)
+  CFLAGS        += "-DCEED_USE_SYCL"
 endif
 
 # MAGMA Backends
@@ -613,6 +619,7 @@ ifneq ($(wildcard $(MAGMA_DIR)/lib/libmagma.*),)
   endif
   LIBCEED_CONTAINS_CXX = 1
   BACKENDS_MAKE += $(MAGMA_BACKENDS)
+  CFLAGS        += "-DCEED_USE_MAGMA"
 endif
 
 # OCCA Backends
@@ -627,8 +634,9 @@ ifneq ($(wildcard $(OCCA_DIR)/lib/libocca.*),)
   $(libceeds) : CPPFLAGS += -I$(OCCA_DIR)/include
   PKG_LIBS += -L$(abspath $(OCCA_DIR))/lib -locca
   LIBCEED_CONTAINS_CXX = 1
-  libceed.cpp += $(occa.cpp)
+  libceed.cpp   += $(occa.cpp)
   BACKENDS_MAKE += $(OCCA_BACKENDS)
+  CFLAGS        += "-DCEED_USE_OCCA"
 endif
 
 BACKENDS ?= $(BACKENDS_MAKE)
@@ -662,17 +670,16 @@ endif
 # Building core library components
 # ------------------------------------------------------------
 
-# File names *-weak.c contain weak symbol definitions, which must be listed last
-# when creating shared or static libraries.
-weak_last = $(filter-out %-weak.o,$(1)) $(filter %-weak.o,$(1))
+FORCE:
+$(OBJDIR)/backends/ceed-backend-list.o: FORCE
 
 libceed.o = $(libceed.c:%.c=$(OBJDIR)/%.o) $(libceed.cpp:%.cpp=$(OBJDIR)/%.o) $(libceed.cu:%.cu=$(OBJDIR)/%.o) $(libceed.hip:%.hip.cpp=$(OBJDIR)/%.o) $(libceed.sycl:%.sycl.cpp=$(OBJDIR)/%.o)
 $(filter %fortran.o,$(libceed.o)) : CPPFLAGS += $(if $(filter 1,$(UNDERSCORE)),-DUNDERSCORE)
 $(libceed.o): | info-backends
-$(libceed.so) : $(call weak_last,$(libceed.o)) | $$(@D)/.DIR
+$(libceed.so) : $(libceed.o) | $$(@D)/.DIR
 	$(call quiet,LINK) $(LDFLAGS) $(CEED_LDFLAGS) -shared -o $@ $^ $(CEED_LDLIBS) $(LDLIBS)
 
-$(libceed.a) : $(call weak_last,$(libceed.o)) | $$(@D)/.DIR
+$(libceed.a) : $(libceed.o) | $$(@D)/.DIR
 	$(call quiet,AR) $(ARFLAGS) $@ $^
 
 $(OBJDIR)/%.o : $(CURDIR)/%.c | $$(@D)/.DIR

backends/avx/ceed-avx-blocked.c

@@ -10,12 +10,13 @@
 #include <stdbool.h>
 #include <string.h>
 
+#include "../ceed-backend-init.h"
 #include "ceed-avx.h"
 
 //------------------------------------------------------------------------------
 // Backend Init
 //------------------------------------------------------------------------------
-static int CeedInit_Avx(const char *resource, Ceed ceed) {
+CEED_INTERN int CeedInit_Avx_Blocked(const char *resource, Ceed ceed) {
   Ceed ceed_ref;
 
   CeedCheck(!strcmp(resource, "/cpu/self") || !strcmp(resource, "/cpu/self/avx") || !strcmp(resource, "/cpu/self/avx/blocked"), ceed,
@@ -32,8 +33,3 @@ static int CeedInit_Avx(const char *resource, Ceed ceed) {
 }
 
 //------------------------------------------------------------------------------
-// Backend Register
-//------------------------------------------------------------------------------
-CEED_INTERN int CeedRegister_Avx_Blocked(void) { return CeedRegister("/cpu/self/avx/blocked", CeedInit_Avx, 30); }
-
-//------------------------------------------------------------------------------

backends/avx/ceed-avx-serial.c

@@ -10,12 +10,13 @@
 #include <stdbool.h>
 #include <string.h>
 
+#include "../ceed-backend-init.h"
 #include "ceed-avx.h"
 
 //------------------------------------------------------------------------------
 // Backend Init
 //------------------------------------------------------------------------------
-static int CeedInit_Avx(const char *resource, Ceed ceed) {
+CEED_INTERN int CeedInit_Avx_Serial(const char *resource, Ceed ceed) {
   Ceed ceed_ref;
 
   CeedCheck(!strcmp(resource, "/cpu/self") || !strcmp(resource, "/cpu/self/avx/serial"), ceed, CEED_ERROR_BACKEND,
@@ -32,8 +33,3 @@ static int CeedInit_Avx(const char *resource, Ceed ceed) {
 }
 
 //------------------------------------------------------------------------------
-// Backend Register
-//------------------------------------------------------------------------------
-CEED_INTERN int CeedRegister_Avx_Serial(void) { return CeedRegister("/cpu/self/avx/serial", CeedInit_Avx, 35); }
-
-//------------------------------------------------------------------------------

backends/blocked/ceed-blocked.c

@@ -5,17 +5,18 @@
 //
 // This file is part of CEED:  http://github.com/ceed
 
-#include "ceed-blocked.h"
-
 #include <ceed.h>
 #include <ceed/backend.h>
 #include <stdbool.h>
 #include <string.h>
 
+#include "../ceed-backend-init.h"
+#include "ceed-blocked.h"
+
 //------------------------------------------------------------------------------
 // Backend Init
 //------------------------------------------------------------------------------
-static int CeedInit_Blocked(const char *resource, Ceed ceed) {
+CEED_INTERN int CeedInit_Ref_Blocked(const char *resource, Ceed ceed) {
   Ceed ceed_ref;
 
   CeedCheck(!strcmp(resource, "/cpu/self") || !strcmp(resource, "/cpu/self/ref/blocked"), ceed, CEED_ERROR_BACKEND,
@@ -32,8 +33,3 @@ static int CeedInit_Blocked(const char *resource, Ceed ceed) {
 }
 
 //------------------------------------------------------------------------------
-// Backend Register
-//------------------------------------------------------------------------------
-CEED_INTERN int CeedRegister_Ref_Blocked(void) { return CeedRegister("/cpu/self/ref/blocked", CeedInit_Blocked, 55); }
-
-//------------------------------------------------------------------------------

backends/ceed-backend-init.h

@@ -0,0 +1,14 @@
+// Copyright (c) 2017-2025, Lawrence Livermore National Security, LLC and other CEED contributors.
+// All Rights Reserved. See the top-level LICENSE and NOTICE files for details.
+//
+// SPDX-License-Identifier: BSD-2-Clause
+//
+// This file is part of CEED:  http://github.com/ceed
+#pragma once
+
+#include <ceed/backend.h>
+
+#undef CEED_BACKEND
+#define CEED_BACKEND(name) CEED_INTERN int CeedInit_##name(const char *resource, Ceed ceed);
+#include "../backends/ceed-backend-list.h"
+#undef CEED_BACKEND