Reduce TestMatrix calls for xgemmbatched.

Replace the looped test by a single one with the maximal found offset.
pull/372/head
Tarmo Räntilä 2019-12-09 22:13:52 +02:00
parent 6ac74008b6
commit bf50c4e53e
2 changed files with 32 additions and 5 deletions

View File

@ -79,11 +79,9 @@ void XgemmBatched<T>::DoGemmBatched(const Layout layout, const Transpose a_trans
gemm_kernel_id);
// Tests the matrices for validity
for (auto batch = size_t{0}; batch < batch_count; ++batch) {
TestMatrixA(a_one, a_two, a_buffer, a_offsets[batch], a_ld, false); // don't test for invalid LD
TestMatrixB(b_one, b_two, b_buffer, b_offsets[batch], b_ld, false); // don't test for invalid LD
TestMatrixC(c_one, c_two, c_buffer, c_offsets[batch], c_ld);
}
TestBatchedMatrixA(a_one, a_two, a_buffer, a_offsets, a_ld, false); // don't test for invalid LD
TestBatchedMatrixB(b_one, b_two, b_buffer, b_offsets, b_ld, false); // don't test for invalid LD
TestBatchedMatrixC(c_one, c_two, c_buffer, c_offsets, c_ld);
// Upload the scalar arguments to the device
auto alphas_device = Buffer<T>(context_, BufferAccess::kReadWrite, batch_count);

View File

@ -15,6 +15,9 @@
#ifndef CLBLAST_BUFFER_TEST_H_
#define CLBLAST_BUFFER_TEST_H_
#include <algorithm>
#include <vector>
#include "utilities/utilities.hpp"
namespace clblast {
@ -104,6 +107,32 @@ void TestVectorIndex(const size_t n, const Buffer<T> &buffer, const size_t offse
} catch (const Error<std::runtime_error> &e) { throw BLASError(StatusCode::kInvalidVectorScalar, e.what()); }
}
// =================================================================================================
// Tests matrix 'A' for validity in a batched setting
template <typename T>
void TestBatchedMatrixA(const size_t one, const size_t two, const Buffer<T>& buffer,
const std::vector<size_t> &offsets, const size_t ld, const bool test_lead_dim = true) {
const auto max_offset = *std::max_element(offsets.begin(), offsets.end());
TestMatrixA(one, two, buffer, max_offset, ld, test_lead_dim);
}
// Tests matrix 'B' for validity in a batched setting
template <typename T>
void TestBatchedMatrixB(const size_t one, const size_t two, const Buffer<T>& buffer,
const std::vector<size_t>& offsets, const size_t ld, const bool test_lead_dim = true) {
const auto max_offset = *std::max_element(offsets.begin(), offsets.end());
TestMatrixB(one, two, buffer, max_offset, ld, test_lead_dim);
}
// Tests matrix 'C' for validity in a batched setting
template <typename T>
void TestBatchedMatrixC(const size_t one, const size_t two, const Buffer<T>& buffer,
const std::vector<size_t>& offsets, const size_t ld) {
const auto max_offset = *std::max_element(offsets.begin(), offsets.end());
TestMatrixC(one, two, buffer, max_offset, ld);
}
// =================================================================================================
} // namespace clblast