ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-25 08:19:02 +00:00
Code Packages Projects Releases Wiki Activity

relationals: Use stringstream in print_hex_mem_dump (#1597)

Browse Source 
print_hex_mem_dump was calling `sprintf` with source and destination
buffers overlapping, which is explicitly forbidden.  Rewrite the
function to use C++ stringstreams instead.

This commit only affects the error path and does not change the
printed output.  Error logs before and after this commit should not
differ.

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
This commit is contained in:
Sven van Haastregt
2023-01-20 15:11:31 +00:00
committed by GitHub
parent 1eeb10296f
commit 487dbd292e
1 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
test_conformance/relationals/test_shuffles.cpp
View File

@@ -13,6 +13,9 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// //
#include <iomanip>
#include "testBase.h" #include "testBase.h"
#include "harness/conversions.h" #include "harness/conversions.h"
#include "harness/typeWrappers.h" #include "harness/typeWrappers.h"
@@ -260,33 +263,48 @@ char * get_order_name( ExplicitType vecType, size_t inVecSize, size_t outVecSize
return orderName; return orderName;
} }
void print_hex_mem_dump( const unsigned char *inDataPtr, const unsigned char * inDataPtr2, const unsigned char *expected, const unsigned char *outDataPtr, size_t inVecSize, size_t outVecSize, size_t typeSize ) void print_hex_mem_dump(const unsigned char *inDataPtr,
const unsigned char *inDataPtr2,
const unsigned char *expected,
const unsigned char *outDataPtr, size_t inVecSize,
size_t outVecSize, size_t typeSize)
{ {
char error [4096] = ""; auto byte_to_hex_str = [](unsigned char v) {
strcat(error, " Source: "); // Use a new stream to avoid manipulating state of outer stream.
for( unsigned int j = 0; j < inVecSize * typeSize; j++ ) std::ostringstream ss;
ss << std::setfill('0') << std::setw(2) << std::right << std::hex << +v;
return ss.str();
};
std::ostringstream error;
error << " Source: ";
for (size_t j = 0; j < inVecSize * typeSize; j++)
{ {
sprintf(error, "%s%s%02x ",error, ( j % typeSize ) ? "" : " ", (cl_uchar)inDataPtr[ j ] ); error << (j % typeSize ? "" : " ") << byte_to_hex_str(inDataPtr[j])
<< " ";
} }
if( inDataPtr2 != NULL ) if (inDataPtr2 != NULL)
{ {
strcat(error, "\n Source 2: "); error << "\n Source 2: ";
for( unsigned int j = 0; j < inVecSize * typeSize; j++ ) for (size_t j = 0; j < inVecSize * typeSize; j++)
{ {
sprintf(error, "%s%s%02x ",error, ( j % typeSize ) ? "" : " ", (cl_uchar)inDataPtr2[ j ] ); error << (j % typeSize ? "" : " ") << byte_to_hex_str(inDataPtr2[j])
<< " ";
} }
} }
strcat(error, "\n Expected: " ); error << "\n Expected: ";
for( unsigned int j = 0; j < outVecSize * typeSize; j++ ) for (size_t j = 0; j < outVecSize * typeSize; j++)
{ {
sprintf(error, "%s%s%02x ",error, ( j % typeSize ) ? "" : " ", (cl_uchar)expected[ j ] ); error << (j % typeSize ? "" : " ") << byte_to_hex_str(expected[j])
<< " ";
} }
strcat(error, "\n Actual: " ); error << "\n Actual: ";
for( unsigned int j = 0; j < outVecSize * typeSize; j++ ) for (size_t j = 0; j < outVecSize * typeSize; j++)
{ {
sprintf(error, "%s%s%02x ",error, ( j % typeSize ) ? "" : " ", (cl_uchar)outDataPtr[ j ] ); error << (j % typeSize ? "" : " ") << byte_to_hex_str(outDataPtr[j])
<< " ";
} }
log_info("%s\n", error); log_info("%s\n", error.str().c_str());
} }
void generate_shuffle_mask( char *outMaskString, size_t maskSize, const ShuffleOrder *order ) void generate_shuffle_mask( char *outMaskString, size_t maskSize, const ShuffleOrder *order )