Reorganized zen make_defs.mk to mimic zen2, zen3.

Details: - Restructured clang and AOCC support in config/zen/make_defs.mk to bring that file into alignment with recent changes to the make_defs.mk of zen2 and zen3 subconfigs. - Added missing options (-mllvm -disable-licm-vrp) to the znver1 conditional case of aocc handling in zen2/make_defs.mk. These options were present in the amd_config.mk fragment that was being included in the previous version of zen2/make_defs.mk, but was accidentally omitted from the newer version introduced recently in 7872c3a.
flame · Nov 10, 2021 · b641cf7 · b641cf7
1 parent 7872c3a
commit b641cf7
Show file tree

Hide file tree

Showing 3 changed files with 124 additions and 31 deletions.
diff --git a/config/zen/make_defs.mk b/config/zen/make_defs.mk
@@ -1,11 +1,10 @@
 #
 #
-#  BLIS    
+#  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.
+#  Copyright (C) 2020, 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
@@ -33,9 +32,6 @@
 #
 #
 
-# 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.
@@ -46,37 +42,50 @@ THIS_CONFIG    := zen
 # --- 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)
+# NOTE: The build system will append these variables with various
+# general-purpose/configuration-agnostic flags in common.mk. You
+# may specify additional flags here as needed.
+CPPROCFLAGS    :=
+CMISCFLAGS     :=
+CPICFLAGS      :=
+CWARNFLAGS     :=
 
-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
+ifneq ($(DEBUG_TYPE),off)
+CDBGFLAGS      := -g
+endif
+
+ifeq ($(DEBUG_TYPE),noopt)
+COPTFLAGS      := -O0
 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
+COPTFLAGS      := -O2 -fomit-frame-pointer
 endif
+
+# Flags specific to optimized and reference kernels.
+# NOTE: The -fomit-frame-pointer option is needed for some kernels because
+# they make explicit use of the rbp register.
+CKOPTFLAGS         := $(COPTFLAGS) -O3
+CROPTFLAGS         := $(CKOPTFLAGS)
+CKVECFLAGS         := -mavx2 -mfma -mfpmath=sse
+CRVECFLAGS         := $(CKVECFLAGS) -funsafe-math-optimizations -ffp-contract=fast
+ifeq ($(CC_VENDOR),gcc)
+  ifeq ($(GCC_OT_6_1_0),yes)  # gcc versions older than 6.1.
+    CVECFLAGS_VER  := -march=bdver4 -mno-fma4 -mno-tbm -mno-xop -mno-lwp
+  else
+    CVECFLAGS_VER  := -march=znver1 -mno-avx256-split-unaligned-store
+  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
+  CVECFLAGS_VER    := -march=znver1
+else
+ifeq ($(CC_VENDOR),aocc)
+  CVECFLAGS_VER    := -march=znver1 -mllvm -disable-licm-vrp
 else
-$(error gcc or clang are required for this configuration.)
+  $(error gcc, clang, or aocc is required for this configuration.)
+endif
 endif
 endif
+CKVECFLAGS         += $(CVECFLAGS_VER)
+CRVECFLAGS         += $(CVECFLAGS_VER)
 
 # Store all of the variables here to new variables containing the
 # configuration name.

diff --git a/config/zen/make_defs.mk.old b/config/zen/make_defs.mk.old
@@ -0,0 +1,84 @@
+#
+#
+#  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)))
+
diff --git a/config/zen2/make_defs.mk b/config/zen2/make_defs.mk
@@ -1,6 +1,6 @@
 #
 #
-#  BLIS    
+#  BLIS
 #  An object-based framework for developing high-performance BLAS-like
 #  libraries.
 #
@@ -87,7 +87,7 @@ ifeq ($(CC_VENDOR),clang)
 else
 ifeq ($(CC_VENDOR),aocc)
   ifeq ($(AOCC_OT_2_0_0),yes)   # aocc versions older than 2.0.
-    CVECFLAGS_VER  := -march=znver1
+    CVECFLAGS_VER  := -march=znver1 -mllvm -disable-licm-vrp
   else                          # aocc versions 2.0 or newer.
     CVECFLAGS_VER  := -march=znver2
   endif