Include LP64/ILP64 in BLIS binary name

dzambare · dzambare · commit c5e6f885f00e · 2021-09-23T08:41:02.000+05:30
Binary name will be chosen based on multi-threading and BLAS
  integer size configuration as given below.

  libblis-[mt]-lp64 - when configured to use 32 bit integers
  libblis-[mt]-ilp64 - when configured to use 64 bit integers

AMD-Internal: [CPUPL-1879]
Change-Id: I865023c63235a0a72bdfce7057b2cfb8158b1d87
diff --git a/build/config.mk.in b/build/config.mk.in
@@ -5,6 +5,7 @@
 #  libraries.
 #
 #  Copyright (C) 2014, The University of Texas at Austin
+#  Copyright (C) 2021, 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
@@ -200,5 +201,8 @@ MK_COMPLEX_RETURN_SCHEME := @complex_return@
 # Status of aocl dynamic configuration
 MK_ENABLE_AOCL_DYNAMIC := @enable_aocl_dynamic@
 
+# BLAS int size
+MK_BLAS_INT_TYPE_SIZE := @blas_int_type_size@
+
 # end of ifndef CONFIG_MK_INCLUDED conditional block
 endif
diff --git a/common.mk b/common.mk
@@ -1,11 +1,11 @@
 #
 #
-#  BLIS    
+#  BLIS
 #  An object-based framework for developing high-performance BLAS-like
 #  libraries.
 #
 #  Copyright (C) 2014, The University of Texas at Austin
-#  Copyright (C) 2020, Advanced Micro Devices, Inc.
+#  Copyright (C) 2020-2021, 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
@@ -411,9 +411,17 @@ BASE_LIB_PATH      := $(LIB_PATH)
 
 # The base name of the BLIS library that we will build.
 ifeq ($(THREADING_MODEL),off)
-LIBBLIS            := libblis
+ifeq ($(MK_BLAS_INT_TYPE_SIZE), 64)
+LIBBLIS            := libblis-ilp64
 else
-LIBBLIS            := libblis-mt
+LIBBLIS            := libblis-lp64
+endif
+else
+ifeq ($(MK_BLAS_INT_TYPE_SIZE), 64)
+LIBBLIS            := libblis-mt-ilp64
+else
+LIBBLIS            := libblis-mt-lp64
+endif
 endif
 
 # The shared (dynamic) library file suffix is different for Linux and OS X.
diff --git a/configure b/configure
@@ -5,7 +5,7 @@
 #  libraries.
 #
 #  Copyright (C) 2014, The University of Texas at Austin
-#  Copyright (C) 2020-2021, Advanced Micro Devices, Inc.
+#  Copyright (C) 2020-2021, 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
@@ -3369,6 +3369,7 @@ main()
 		| sed -e "s/@enable_trsm_preinversion@/${enable_trsm_preinversion}/g" \
 		| sed -e "s/@enable_aocl_dynamic@/${enable_aocl_dynamic}/g" \
 		| sed -e "s/@complex_return@/${complex_return}/g" \
+		| sed -e "s/@blas_int_type_size@/${blas_int_type_size}/g" \
 		> "${config_mk_out_path}"
 
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`# libraries.`
`6`	`6`	`#`
`7`	`7`	`# Copyright (C) 2014, The University of Texas at Austin`
`8`		`-# Copyright (C) 2020-2021, Advanced Micro Devices, Inc.`
	`8`	`+# Copyright (C) 2020-2021, Advanced Micro Devices, Inc. All rights reserved.`
`9`	`9`	`#`
`10`	`10`	`# Redistribution and use in source and binary forms, with or without`
`11`	`11`	`# modification, are permitted provided that the following conditions are`
`@@ -3369,6 +3369,7 @@ main()`
`3369`	`3369`	`\| sed -e "s/@enable_trsm_preinversion@/${enable_trsm_preinversion}/g" \`
`3370`	`3370`	`\| sed -e "s/@enable_aocl_dynamic@/${enable_aocl_dynamic}/g" \`
`3371`	`3371`	`\| sed -e "s/@complex_return@/${complex_return}/g" \`
	`3372`	`+ \| sed -e "s/@blas_int_type_size@/${blas_int_type_size}/g" \`
`3372`	`3373`	`> "${config_mk_out_path}"`
`3373`	`3374`
`3374`	`3375`