mirror of
https://github.com/amd/blis.git
synced 2026-05-04 22:41:11 +00:00
29b0e1ef4e
Details: - NOTE: This is a merge commit of 'master' of git://github.com/amd/blis into 'amd-master' of flame/blis. - Fixed a bug in the downstream value of BLIS_NUM_ARCHS, which was inadvertantly not incremented when the Zen2 subconfiguration was added. - In bli_gemm_front(), added a missing conditional constraint around the call to bli_gemm_small() that ensures that the computation precision of C matches the storage precision of C. - In bli_syrk_front(), reorganized and relocated the notrans/trans logic that existed around the call to bli_syrk_small() into bli_syrk_small() to minimize the calling code footprint and also to bring that code into stylistic harmony with similar code in bli_gemm_front() and bli_trsm_front(). Also, replaced direct accessing of obj_t fields with proper accessor static functions (e.g. 'a->dim[0]' becomes 'bli_obj_length( a )'). - Added #ifdef BLIS_ENABLE_SMALL_MATRIX guard around prototypes for bli_gemm_small(), bli_syrk_small(), and bli_trsm_small(). This is strictly speaking unnecessary, but it serves as a useful visual cue to those who may be reading the files. - Removed cpp macro-protected small matrix debugging code from bli_trsm_front.c. - Added a GCC_OT_9_1_0 variable to build/config.mk.in to facilitate gcc version check for availability of -march=znver2, and added appropriate support to configure script. - Cleanups to compiler flags common to recent AMD microarchitectures in config/zen/amd_config.mk, including: removal of -march=znver1 et al. from CKVECFLAGS (since the -march flag is added within make_defs.mk); setting CRVECFLAGS similarly to CKVECFLAGS. - Cleanups to config/zen/bli_cntx_init_zen.c. - Cleanups, added comments to config/zen/make_defs.mk. - Cleanups to config/zen2/make_defs.mk, including making use of newly- added GCC_OT_9_1_0 and existing GCC_OT_6_1_0 to choose the correct set of compiler flags based on the version of gcc being used. - Reverted downstream changes to test/test_gemm.c. - Various whitespace/comment changes.
85 lines
3.4 KiB
Makefile
85 lines
3.4 KiB
Makefile
#
|
|
#
|
|
# BLIS
|
|
# An object-based framework for developing high-performance BLAS-like
|
|
# libraries.
|
|
#
|
|
# Copyright (C) 2014, The University of Texas at Austin
|
|
# Copyright (C) 2019, Advanced Micro Devices, Inc.
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions are
|
|
# met:
|
|
# - Redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer.
|
|
# - Redistributions in binary form must reproduce the above copyright
|
|
# notice, this list of conditions and the following disclaimer in the
|
|
# documentation and/or other materials provided with the distribution.
|
|
# - Neither the name(s) of the copyright holder(s) nor the names of its
|
|
# contributors may be used to endorse or promote products derived
|
|
# from this software without specific prior written permission.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
#
|
|
#
|
|
|
|
# FLAGS that are specific to the 'zen' architecture are added here.
|
|
# FLAGS that are common for all the AMD architectures are present in
|
|
# amd_config.mk.
|
|
|
|
# Declare the name of the current configuration and add it to the
|
|
# running list of configurations included by common.mk.
|
|
THIS_CONFIG := zen
|
|
#CONFIGS_INCL += $(THIS_CONFIG)
|
|
|
|
#
|
|
# --- Determine the C compiler and related flags ---
|
|
#
|
|
|
|
# Include the file containing common flags for all AMD architectures.
|
|
AMD_CONFIG_FILE := amd_config.mk
|
|
AMD_CONFIG_PATH := $(BASE_SHARE_PATH)/config/zen
|
|
-include $(AMD_CONFIG_PATH)/$(AMD_CONFIG_FILE)
|
|
|
|
ifeq ($(CC_VENDOR),gcc)
|
|
# If gcc is older than 6.1.0, we must use -march=bdver4 and then remove the
|
|
# Bulldozer instruction sets that were omitted from Zen.
|
|
# Additionally, if gcc is 4.9 (clang 3.5?) or newer, we may want to add
|
|
# Zen-specific instructions back into the mix:
|
|
# -mclzero -madx -mrdseed -mmwaitx -msha -mxsavec -mxsaves -mclflushopt -mpopcnt
|
|
ifeq ($(GCC_OT_6_1_0),yes)
|
|
CRVECFLAGS += -march=bdver4 -mno-fma4 -mno-tbm -mno-xop -mno-lwp
|
|
CKVECFLAGS += -march=bdver4 -mno-fma4 -mno-tbm -mno-xop -mno-lwp
|
|
else
|
|
# If gcc is at least 6.1.0, then we can specify the microarchitecture using
|
|
# the preferred option.
|
|
CRVECFLAGS += -march=znver1
|
|
CKVECFLAGS += -march=znver1
|
|
endif
|
|
else
|
|
ifeq ($(CC_VENDOR),clang)
|
|
# I couldn't find which versions of clang added support for -march=znver1,
|
|
# so we don't even bother attempting the differentiation that appears in the
|
|
# gcc branch above.
|
|
CRVECFLAGS += -march=znver1
|
|
CKVECFLAGS += -march=znver1
|
|
else
|
|
$(error gcc or clang are required for this configuration.)
|
|
endif
|
|
endif
|
|
|
|
# Store all of the variables here to new variables containing the
|
|
# configuration name.
|
|
$(eval $(call store-make-defs,$(THIS_CONFIG)))
|
|
|