Option to use shared library for BLIS tests

Current BLIS makefile always uses the static library on Linux for all BLIS test programs. This commit adds the option to use the shared library instead by specifying e.g. make checkblis USE_SHARED=yes Executables are generated in different sub-directories for static and shared libraries. AMD-Internal: [CPUPL-4107] Change-Id: I3ab5d505cfbc5f6ef47aa28fcbb846c52d56c3f2
2026-04-19 15:18:52 +00:00 · 2023-10-26 10:31:12 -04:00
parent d45d1d68c6
commit 834bf604c1
3 changed files with 53 additions and 39 deletions
--- a/40
+++ b/40
@@ -320,6 +320,7 @@ BLASTEST_INPUT_PATH    := $(DIST_PATH)/$(BLASTEST_DIR)/input

 # The location of the BLAS test suite object directory.
 BASE_OBJ_BLASTEST_PATH := $(BASE_OBJ_PATH)/$(BLASTEST_DIR)
+BASE_EXE_BLASTEST_PATH := $(BASE_OBJ_BLASTEST_PATH)/$(MK_USE_LIB)

 # The locations of the BLAS test suite source code (f2c and drivers).
 BLASTEST_F2C_SRC_PATH  := $(DIST_PATH)/$(BLASTEST_DIR)/f2c
@@ -347,7 +348,7 @@ BLASTEST_DRV_BASES     := $(basename $(notdir $(BLASTEST_DRV_OBJS)))

 # The binary executable driver names.
 BLASTEST_DRV_BINS      := $(addsuffix .x,$(BLASTEST_DRV_BASES))
-BLASTEST_DRV_BIN_PATHS := $(addprefix $(BASE_OBJ_BLASTEST_PATH)/,$(BLASTEST_DRV_BINS))
+BLASTEST_DRV_BIN_PATHS := $(addprefix $(BASE_EXE_BLASTEST_PATH)/,$(BLASTEST_DRV_BINS))

 # Binary executable driver "run-" names
 BLASTEST_DRV_BINS_R    := $(addprefix run-,$(BLASTEST_DRV_BASES))
@@ -393,6 +394,7 @@ TESTSUITE_SALT_OPS_PATH := $(DIST_PATH)/$(TESTSUITE_DIR)/$(TESTSUITE_SALT_OPS)
 # directory.
 TESTSUITE_SRC_PATH      := $(DIST_PATH)/$(TESTSUITE_DIR)/src
 BASE_OBJ_TESTSUITE_PATH := $(BASE_OBJ_PATH)/$(TESTSUITE_DIR)
+BASE_EXE_TESTSUITE_PATH := $(BASE_OBJ_PATH)/$(TESTSUITE_DIR)/$(MK_USE_LIB)

 # Convert source file paths to object file paths by replacing the base source
 # directories with the base object directories, and also replacing the source
@@ -414,7 +416,7 @@ MK_TESTSUITE_OBJS       := $(sort \
 # unusual environments (e.g. ARM) can run the testsuite through some other
 # binary. See .travis.yml for details on how the variable is employed in
 # practice.
-TESTSUITE_BIN           := test_$(LIBBLIS).x
+TESTSUITE_BIN           := $(BASE_EXE_TESTSUITE_PATH)/test_$(LIBBLIS).x
 TESTSUITE_WRAPPER       ?=

 # The location of the script that checks the BLIS testsuite output.
@@ -850,7 +852,8 @@ endif

 # first argument: the base name of the BLAS test driver.
 define make-blat-rule
-$(BASE_OBJ_BLASTEST_PATH)/$(1).x: $(BASE_OBJ_BLASTEST_PATH)/$(1).o $(BLASTEST_F2C_LIB) $(LIBBLIS_LINK)
+$(BASE_EXE_BLASTEST_PATH)/$(1).x: $(BASE_OBJ_BLASTEST_PATH)/$(1).o $(BLASTEST_F2C_LIB) $(LIBBLIS_LINK)
+	@mkdir -p $(BASE_EXE_BLASTEST_PATH)
 ifeq ($(ENABLE_VERBOSE),yes)
 	$(LINKER) $(BASE_OBJ_BLASTEST_PATH)/$(1).o $(BLASTEST_F2C_LIB) $(LIBBLIS_LINK) $(LDFLAGS) -o $$@
 else
@@ -864,12 +867,12 @@ $(foreach name, $(BLASTEST_DRV_BASES), $(eval $(call make-blat-rule,$(name))))

 # A rule to run ?blat1.x driver files.
 define make-run-blat1-rule
-run-$(1): $(BASE_OBJ_BLASTEST_PATH)/$(1).x
+run-$(1): $(BASE_EXE_BLASTEST_PATH)/$(1).x
 ifeq ($(ENABLE_VERBOSE),yes)
-	$(TESTSUITE_WRAPPER) $(BASE_OBJ_BLASTEST_PATH)/$(1).x > out.$(1)
+	$(TESTSUITE_WRAPPER) $(BASE_EXE_BLASTEST_PATH)/$(1).x > out.$(1)
 else
 	@echo "Running $(1).x > 'out.$(1)'"
-	@$(TESTSUITE_WRAPPER) $(BASE_OBJ_BLASTEST_PATH)/$(1).x > out.$(1)
+	@$(TESTSUITE_WRAPPER) $(BASE_EXE_BLASTEST_PATH)/$(1).x > out.$(1)
 endif
 endef

@@ -878,12 +881,12 @@ $(foreach name, $(BLASTEST_DRV1_BASES), $(eval $(call make-run-blat1-rule,$(name

 # A rule to run ?blat2.x and ?blat3.x driver files.
 define make-run-blat23-rule
-run-$(1): $(BASE_OBJ_BLASTEST_PATH)/$(1).x
+run-$(1): $(BASE_EXE_BLASTEST_PATH)/$(1).x
 ifeq ($(ENABLE_VERBOSE),yes)
-	$(TESTSUITE_WRAPPER) $(BASE_OBJ_BLASTEST_PATH)/$(1).x < $(BLASTEST_INPUT_PATH)/$(1).in
+	$(TESTSUITE_WRAPPER) $(BASE_EXE_BLASTEST_PATH)/$(1).x < $(BLASTEST_INPUT_PATH)/$(1).in
 else
 	@echo "Running $(1).x < '$(BLASTEST_INPUT_PATH)/$(1).in' (output to 'out.$(1)')"
-	@$(TESTSUITE_WRAPPER) $(BASE_OBJ_BLASTEST_PATH)/$(1).x < $(BLASTEST_INPUT_PATH)/$(1).in
+	@$(TESTSUITE_WRAPPER) $(BASE_EXE_BLASTEST_PATH)/$(1).x < $(BLASTEST_INPUT_PATH)/$(1).in
 endif
 endef

@@ -926,6 +929,7 @@ endif

 # Testsuite binary rule.
 $(TESTSUITE_BIN): $(MK_TESTSUITE_OBJS) $(LIBBLIS_LINK)
+	@mkdir -p $(BASE_EXE_TESTSUITE_PATH)
 ifeq ($(ENABLE_VERBOSE),yes)
 	$(LINKER) $(MK_TESTSUITE_OBJS) $(LIBBLIS_LINK) $(LDFLAGS) -o $@
 else
@@ -936,13 +940,13 @@ endif
 # A rule to run the testsuite using the normal input.* files.
 testsuite-run: testsuite-bin
 ifeq ($(ENABLE_VERBOSE),yes)
-	$(TESTSUITE_WRAPPER) ./$(TESTSUITE_BIN) -g $(TESTSUITE_CONF_GEN_PATH) \
+	$(TESTSUITE_WRAPPER) $(TESTSUITE_BIN) -g $(TESTSUITE_CONF_GEN_PATH) \
 	                   -o $(TESTSUITE_CONF_OPS_PATH) \
 	                    > $(TESTSUITE_OUT_FILE)

 else
 	@echo "Running $(TESTSUITE_BIN) with output redirected to '$(TESTSUITE_OUT_FILE)'"
-	@$(TESTSUITE_WRAPPER) ./$(TESTSUITE_BIN) -g $(TESTSUITE_CONF_GEN_PATH) \
+	@$(TESTSUITE_WRAPPER) $(TESTSUITE_BIN) -g $(TESTSUITE_CONF_GEN_PATH) \
 	                    -o $(TESTSUITE_CONF_OPS_PATH) \
 	                     > $(TESTSUITE_OUT_FILE)
 endif
@@ -1285,7 +1289,7 @@ ifeq ($(IS_CONFIGURED),yes)
 ifeq ($(ENABLE_VERBOSE),yes)
 	- $(RM_F) $(BLASTEST_F2C_OBJS) $(BLASTEST_DRV_OBJS)
 	- $(RM_F) $(BLASTEST_F2C_LIB)
-	- $(RM_F) $(BLASTEST_DRV_BIN_PATHS)
+	- $(RM_RF) $(BASE_OBJ_BLASTEST_PATH)/{shared,static}
 	- $(RM_F) $(addprefix out.,$(BLASTEST_DRV_BASES))
 else
 	@echo "Removing object files from $(BASE_OBJ_BLASTEST_PATH)"
@@ -1293,7 +1297,7 @@ else
 	@echo "Removing libf2c.a from $(BASE_OBJ_BLASTEST_PATH)"
 	@- $(RM_F) $(BLASTEST_F2C_LIB)
 	@echo "Removing binaries from $(BASE_OBJ_BLASTEST_PATH)"
-	@- $(RM_F) $(BLASTEST_DRV_BIN_PATHS)
+	@- $(RM_RF) $(BASE_OBJ_BLASTEST_PATH)/{shared,static}
 	@echo "Removing driver output files 'out.*'"
 	@- $(RM_F) $(addprefix out.,$(BLASTEST_DRV_BASES))
 endif # ENABLE_VERBOSE
@@ -1328,13 +1332,13 @@ cleanblistesttop:
 ifeq ($(IS_CONFIGURED),yes)
 ifeq ($(ENABLE_VERBOSE),yes)
 	- $(RM_F) $(MK_TESTSUITE_OBJS)
-	- $(RM_F) $(TESTSUITE_BIN)
+	- $(RM_RF) $(BASE_OBJ_TESTSUITE_PATH)/{shared,static}
 	- $(RM_F) $(TESTSUITE_OUT_FILE)
 else
 	@echo "Removing object files from $(BASE_OBJ_TESTSUITE_PATH)"
 	@- $(RM_F) $(MK_TESTSUITE_OBJS)
 	@echo "Removing binary $(TESTSUITE_BIN)"
-	@- $(RM_F) $(TESTSUITE_BIN)
+	@- $(RM_RF) $(BASE_OBJ_TESTSUITE_PATH)/{shared,static}
 	@echo "Removing $(TESTSUITE_OUT_FILE)"
 	@- $(RM_F) $(TESTSUITE_OUT_FILE)
 endif # ENABLE_VERBOSE
@@ -1344,13 +1348,13 @@ cleanblistestdir:
 ifeq ($(IS_CONFIGURED),yes)
 ifeq ($(ENABLE_VERBOSE),yes)
 	- $(FIND) $(TESTSUITE_DIR)/$(OBJ_DIR) -name "*.o" | $(XARGS) $(RM_F)
-	- $(RM_F) $(TESTSUITE_DIR)/$(TESTSUITE_BIN)
+	- $(RM_RF) $(BASE_OBJ_TESTSUITE_PATH)/{shared,static}
 	- $(MAKE) -C $(VEND_TESTCPP_DIR) clean
 else
 	@echo "Removing object files from $(TESTSUITE_DIR)/$(OBJ_DIR)"
 	@- $(FIND) $(TESTSUITE_DIR)/$(OBJ_DIR) -name "*.o" | $(XARGS) $(RM_F)
-	@echo "Removing binary $(TESTSUITE_DIR)/$(TESTSUITE_BIN)"
-	@- $(RM_F) $(TESTSUITE_DIR)/$(TESTSUITE_BIN)
+	@echo "Removing binary $(TESTSUITE_BIN)"
+	@- $(RM_RF) $(BASE_OBJ_TESTSUITE_PATH)/{shared,static}
 	@$(MAKE) -C $(VEND_TESTCPP_DIR) clean
 endif # ENABLE_VERBOSE
 endif # IS_CONFIGURED
--- a/common.mk
+++ b/common.mk
@@ -5,7 +5,7 @@
 #  libraries.
 #
 #  Copyright (C) 2014, The University of Texas at Austin
-#  Copyright (C) 2020-2022, Advanced Micro Devices, Inc. All rights reserved.
+#  Copyright (C) 2020-2023, Advanced Micro Devices, Inc. All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or without
 #  modification, are permitted provided that the following conditions are
@@ -599,27 +599,35 @@ SOFLAGS    += -Wl,-soname,$(LIBBLIS_SONAME)
 endif
 endif

+# Decide whether to use static or shared library on Linux and OS X
+MK_USE_LIB=static
+ifeq ($(MK_ENABLE_STATIC),no)
+  MK_USE_LIB=shared
+endif
+ifeq ($(USE_SHARED),yes)
+  MK_USE_LIB=shared
+endif
+
 # Decide which library to link to for things like the testsuite and BLIS test
 # drivers. We default to the static library, unless only the shared library was
 # enabled, in which case we use the shared library.
 LIBBLIS_L      := $(LIBBLIS_A)
 LIBBLIS_LINK   := $(LIBBLIS_A_PATH)
 ifeq ($(MK_ENABLE_SHARED),yes)
-ifeq ($(MK_ENABLE_STATIC),no)
-LIBBLIS_L      := $(LIBBLIS_SO)
-LIBBLIS_LINK   := $(LIBBLIS_SO_PATH)
-ifeq ($(IS_WIN),no)
-# For Linux and OS X: set rpath property of shared object.
-LDFLAGS        += -Wl,-rpath,$(BASE_LIB_PATH)
+  ifeq ($(MK_USE_LIB),shared)
+    LIBBLIS_L      := $(LIBBLIS_SO)
+    LIBBLIS_LINK   := $(LIBBLIS_SO_PATH)
+    ifeq ($(IS_WIN),no)
+      # For Linux and OS X: set rpath property of shared object.
+      LDFLAGS        += -Wl,-rpath,$(BASE_LIB_PATH)
+    endif
+  endif
+  # On windows, use the shared library even if static is created.
+  ifeq ($(IS_WIN),yes)
+    LIBBLIS_L      := $(LIBBLIS_SO)
+    LIBBLIS_LINK   := $(LIBBLIS_SO_PATH)
+  endif
 endif
-endif
-# On windows, use the shared library even if static is created.
-ifeq ($(IS_WIN),yes)
-LIBBLIS_L      := $(LIBBLIS_SO)
-LIBBLIS_LINK   := $(LIBBLIS_SO_PATH)
-endif
-endif
-

 #
 # --- Include makefile definitions file ----------------------------------------
--- a/vendor/testcpp/Makefile
+++ b/vendor/testcpp/Makefile
@@ -3,7 +3,7 @@
 #  libraries.
 #
 #  Copyright (C) 2014, The University of Texas at Austin
-#  Copyright (C) 2017 - 2021, Advanced Micro Devices, Inc.
+#  Copyright (C) 2017-2023, Advanced Micro Devices, Inc. All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or without
 #  modification, are permitted provided that the following conditions are
@@ -142,8 +142,7 @@ LIBBLIS_LINK   := $(LIB_PATH)/$(LIBBLIS_L)
 #
 all: blis 

-
-blis: test_asum_blis.x \
+CPPEXES := test_asum_blis.x \
 	test_axpy_blis.x \
 	test_copy_blis.x \
 	test_dot_blis.x \
@@ -183,8 +182,10 @@ blis: test_asum_blis.x \
 	test_trmm_blis.x \
 	test_trsm_blis.x \
 	test_trsv_blis.x 
- 

+CPPEXES := $(addprefix $(MK_USE_LIB)/,$(CPPEXES))
+
+blis: $(CPPEXES)

 # --Object file rules --

@@ -197,7 +198,8 @@ test_%_blis.o: test_%.cc

 # -- Executable file rules --

-test_%_blis.x: test_%_blis.o $(LIBBLIS_LINK)
+$(MK_USE_LIB)/test_%_blis.x: test_%_blis.o $(LIBBLIS_LINK)
+	@mkdir -p ./$(MK_USE_LIB)
 	@$(LINKER) $^       $(LIBBLIS_LINK) $(LDFLAGS) -o $@
 	./$@

@@ -206,5 +208,5 @@ test_%_blis.x: test_%_blis.o $(LIBBLIS_LINK)
 clean: cleanx

 cleanx:
-	- $(RM_F) *.o *.x
+	- $(RM_F) ./*.o ./{shared,static}/*.x