mirror of
https://github.com/amd/blis.git
synced 2026-04-22 00:28:51 +00:00
Squash-merge 'pr' into 'squash'. (#457)
Merged contributions from AMD's AOCL BLIS (#448). Details: - Added support for level-3 operation gemmt, which performs a gemm on only the lower or upper triangle of a square matrix C. For now, only the conventional/large code path will be supported (in vanilla BLIS). This was accomplished by leveraging the existing variant logic for herk. However, some of the infrastructure to support a gemmtsup is included in this commit, including - A bli_gemmtsup() front-end, similar to bli_gemmsup(). - A bli_gemmtsup_ref() reference handler function. - A bli_gemmtsup_int() variant chooser function (with variant calls commented out). - Added support for inducing complex domain gemmt via the 1m method. - Added gemmt APIs to the BLAS and CBLAS compatiblity layers. - Added gemmt test module to testsuite. - Added standalone gemmt test driver to 'test' directory. - Documented gemmt APIs in BLISObjectAPI.md and BLISTypedAPI.md. - Added a C++ template header (blis.hh) containing a BLAS-inspired wrapper to a set of polymorphic CBLAS-like function wrappers defined in another header (cblas.hh). These two headers are installed if running the 'install' target with INSTALL_HH is set to 'yes'. (Also added a set of unit tests that exercise blis.hh, although they are disabled for now because they aren't compatible with out-of-tree builds.) These files now live in the 'vendor' top-level directory. - Various updates to 'zen' and 'zen2' subconfigurations, particularly within the context initialization functions. - Added s and d copyv, setv, and swapv kernels to kernels/zen/1, and various minor updates to dotv and scalv kernels. Also added various sup kernels contributed by AMD to kernels/zen/3. However, these kernels are (for now) not yet used, in part because they caused AppVeyor clang failures, and also because I have not found time to review and vet them. - Output the python found during configure into the definition of PYTHON in build/config.mk (via build/config.mk.in). - Added early-return checks (A, B, or C with zero dimension; alpha = 0) to bli_gemm_front.c. - Implemented explicit beta = 0 handling in for the sgemm ukernel in bli_gemm_armv7a_int_d4x4.c, which was previously missing. This latent bug surfaced because the gemmt module verifies its computation using gemm with its beta parameter set to zero, which, on a cortexa15 system caused the gemm kernel code to unconditionally multiply the uninitialized C data by beta. The C matrix likely contained non-numeric values such as NaN, which then would have resulted in a false failure. - Fixed a bug whereby the implementation for bli_herk_determine_kc(), in bli_l3_blocksize.c, was inadvertantly being defined in terms of helper functions meant for trmm. This bug was probably harmless since the trmm code should have also done the right thing for herk. - Used cpp macros to neutralize the various AOCL_DTL_TRACE_ macros in kernels/zen/3/bli_gemm_small.c since those macros are not used in vanilla BLIS. - Added cpp guard to definition of bli_mem_clear() in bli_mem.h to accommodate C++'s stricter type checking. - Added cpp guard to test/*.c drivers that facilitate compilation on Windows systems. - Various whitespace changes.
This commit is contained in:
Field G. Van Zee
154
vendor/testcpp/test_trsm.cc
vendored
Normal file
154
vendor/testcpp/test_trsm.cc
vendored
Normal file
@@ -0,0 +1,154 @@
|
||||
/*
|
||||
|
||||
BLISPP
|
||||
C++ test driver for BLIS CPP trsm routine and reference blis trsm routine.
|
||||
|
||||
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.
|
||||
|
||||
*/
|
||||
|
||||
#include <complex>
|
||||
#include <iostream>
|
||||
#include "blis.hh"
|
||||
#include "test.hh"
|
||||
|
||||
using namespace blis;
|
||||
using namespace std;
|
||||
//#define PRINT
|
||||
#define ALPHA 1.0
|
||||
#define M 5
|
||||
#define N 4
|
||||
/*
|
||||
* Test application assumes matrices to be column major, non-transposed
|
||||
*/
|
||||
template< typename T >
|
||||
void ref_trsm(int64_t m, int64_t n,
|
||||
T * alpha,
|
||||
T *A,
|
||||
T *B
|
||||
)
|
||||
|
||||
{
|
||||
obj_t obj_a, obj_b;
|
||||
obj_t obj_alpha;
|
||||
num_t dt;
|
||||
|
||||
if(is_same<T, float>::value)
|
||||
dt = BLIS_FLOAT;
|
||||
else if(is_same<T, double>::value)
|
||||
dt = BLIS_DOUBLE;
|
||||
else if(is_same<T, complex<float>>::value)
|
||||
dt = BLIS_SCOMPLEX;
|
||||
else if(is_same<T, complex<double>>::value)
|
||||
dt = BLIS_DCOMPLEX;
|
||||
|
||||
bli_obj_create_with_attached_buffer( dt, 1, 1, alpha, 1,1,&obj_alpha );
|
||||
bli_obj_create_with_attached_buffer( dt, m, m, A, 1,m,&obj_a );
|
||||
bli_obj_create_with_attached_buffer( dt, m, n, B, 1,m,&obj_b );
|
||||
|
||||
bli_obj_set_struc( BLIS_TRIANGULAR, &obj_a );
|
||||
bli_obj_set_uplo( BLIS_LOWER, &obj_a );
|
||||
bli_obj_set_conjtrans( BLIS_NO_TRANSPOSE, &obj_a );
|
||||
bli_obj_set_diag( BLIS_NONUNIT_DIAG, &obj_a );
|
||||
bli_trsm( BLIS_LEFT,
|
||||
&obj_alpha,
|
||||
&obj_a,
|
||||
&obj_b
|
||||
);
|
||||
|
||||
}
|
||||
template< typename T >
|
||||
void test_trsm( )
|
||||
{
|
||||
T *A, *B, *B_ref;
|
||||
T alpha;
|
||||
int m,n;
|
||||
int lda, ldb, ldb_ref;
|
||||
|
||||
alpha = ALPHA;
|
||||
m = M;
|
||||
n = N;
|
||||
|
||||
lda = m;
|
||||
ldb = m;
|
||||
ldb_ref = m;
|
||||
|
||||
srand (time(NULL));
|
||||
allocate_init_buffer(A , m , m);
|
||||
allocate_init_buffer(B , m , n);
|
||||
copy_buffer(B, B_ref , m ,n);
|
||||
|
||||
#ifdef PRINT
|
||||
printmatrix(A, lda ,m,m, (char *)"A");
|
||||
printmatrix(B, ldb ,m,n, (char *)"B");
|
||||
#endif
|
||||
|
||||
blis::trsm(
|
||||
CblasColMajor,
|
||||
CblasLeft,
|
||||
CblasLower,
|
||||
CblasNoTrans,
|
||||
CblasNonUnit,
|
||||
m,
|
||||
n,
|
||||
alpha,
|
||||
A,
|
||||
lda,
|
||||
B,
|
||||
ldb
|
||||
);
|
||||
|
||||
#ifdef PRINT
|
||||
printmatrix(B, ldb ,m,n, (char *)"B output");
|
||||
#endif
|
||||
ref_trsm(m, n, &alpha, A, B_ref);
|
||||
|
||||
#ifdef PRINT
|
||||
printmatrix(B_ref, ldb_ref ,m,n, (char *)"B ref output");
|
||||
#endif
|
||||
if(computeErrorM(ldb, ldb_ref, m, n, B, B_ref )==1)
|
||||
printf("%s TEST FAIL\n" , __PRETTY_FUNCTION__);
|
||||
else
|
||||
printf("%s TEST PASS\n" , __PRETTY_FUNCTION__);
|
||||
|
||||
|
||||
|
||||
delete[]( A );
|
||||
delete[]( B );
|
||||
delete[]( B_ref );
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
int main( int argc, char** argv )
|
||||
{
|
||||
test_trsm<double>( );
|
||||
test_trsm<float>( );
|
||||
test_trsm<complex<float>>( );
|
||||
test_trsm<complex<double>>( );
|
||||
return 0;
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user