Skip to content

Replaced test values for hexfloat and printf to avoid ambiguity #2425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shajder wants to merge 4 commits into
base: main
Choose a base branch
from
+46 −15
Open

Replaced test values for hexfloat and printf to avoid ambiguity #2425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc8ebbd
Replaced test values for hexfloat and printf to avoid ambiguity
shajder Jun 17, 2025
c7dae6c
Merge branch 'main' into printf_hexfloat_restrictive
shajder Sep 5, 2025
078b51d
Added fallback test for %a float format string to validate round-trip…
shajder Nov 27, 2025
5f27603
Merge branch 'main' into printf_hexfloat_restrictive
shajder Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions test_conformance/printf/test_printf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,15 @@ struct printDataGenParameters
{
std::vector<std::string> genericFormats;
const char* dataRepresentation;
const char* vectorFormatFlag;
const char* vectorFormatSpecifier;
const char* dataType;
const char* vectorSize;
const char* addrSpaceArgumentTypeQualifier;
const char* addrSpaceVariableTypeQualifier;
const char* addrSpaceParameter;
const char* addrSpacePAdd;
const char* vectorFormatFlag = nullptr;
const char* vectorFormatSpecifier = nullptr;
const char* dataType = nullptr;
const char* vectorSize = nullptr;
const char* addrSpaceArgumentTypeQualifier = nullptr;
const char* addrSpaceVariableTypeQualifier = nullptr;
const char* addrSpaceParameter = nullptr;
const char* addrSpacePAdd = nullptr;
bool allowFallbackTest = false;
};

// Reference results - filled out at run-time
Expand Down Expand Up @@ -111,6 +112,9 @@ struct testCase
char*,
const size_t); //function pointer for generating reference results
Type dataType; //the data type that will be printed during reference result generation (used for setting rounding mode)
bool (*fallbackTestFN)(const char*,
const char*) =
nullptr; // function pointer to perform fallback test if required
};

extern const char* strType[];
Expand Down
41 changes: 34 additions & 7 deletions test_conformance/printf/util_printf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@ static void intRefBuilder(printDataGenParameters&, char*, const size_t);
static void halfRefBuilder(printDataGenParameters&, char* rResult,
const size_t);
static void floatRefBuilder(printDataGenParameters&, char* rResult, const size_t);
static bool floatRefTest(const char* refResult, const char* analysisBuffer);
static void doubleRefBuilder(printDataGenParameters&, char* rResult,
const size_t);
static bool doubleRefTest(const char* refResult, const char* analysisBuffer);

static void octalRefBuilder(printDataGenParameters&, char*, const size_t);
static void unsignedRefBuilder(printDataGenParameters&, char*, const size_t);
static void hexRefBuilder(printDataGenParameters&, char*, const size_t);
Expand Down Expand Up @@ -468,12 +471,12 @@ std::vector<printDataGenParameters> printFloatGenParameters = {

// Double argument representing floating-point,in [-]xh.hhhhpAd style

{ { "%.6a" }, "0.1f" },
{ { "%.6a" }, "0.5f", 0, 0, 0, 0, 0, 0, 0, 0, true },

//(Minimum)Ten-wide,Double argument representing floating-point,in
// xh.hhhhpAd style,default(right)-justified

{ { "%10.2a" }, "9990.235f" },
{ { "%10.2a" }, "1.5f", 0, 0, 0, 0, 0, 0, 0, 0, true },

//(Minimum)Ten-wide,two positions after the decimal,with
// a blank space inserted before the value, default(right)-justified
Expand Down Expand Up @@ -502,8 +505,9 @@ testCase testCaseFloat = {

floatRefBuilder,

kfloat
kfloat,

floatRefTest
};

//==============================================
Expand Down Expand Up @@ -673,12 +677,12 @@ std::vector<printDataGenParameters> printDoubleGenParameters = {

// Double argument representing floating-point,in [-]xh.hhhhpAd style

{ { "%.6a" }, "0.1" },
{ { "%.6a" }, "0.5", 0, 0, 0, 0, 0, 0, 0, 0, true },

//(Minimum)Ten-wide,Double argument representing floating-point,in
// xh.hhhhpAd style,default(right)-justified

{ { "%10.2a" }, "9990.235" },
{ { "%10.2a" }, "1.5", 0, 0, 0, 0, 0, 0, 0, 0, true },
};

//---------------------------------------------------------
Expand All @@ -697,8 +701,9 @@ testCase testCaseDouble = {

doubleRefBuilder,

kdouble
kdouble,

doubleRefTest
};

//==============================================
Expand Down Expand Up @@ -1752,7 +1757,15 @@ size_t verifyOutputBuffer(char *analysisBuffer,testCase* pTestCase,size_t testId
return !std::regex_match(analysisBuffer, nanRegex);
}

return strcmp(analysisBuffer, pTestCase->_correctBuffer[testId].c_str());
size_t ret =
strcmp(analysisBuffer, pTestCase->_correctBuffer[testId].c_str());

if (ret != 0 && pTestCase->_genParameters[testId].allowFallbackTest
&& pTestCase->fallbackTestFN)
if (pTestCase->fallbackTestFN(
analysisBuffer, pTestCase->_correctBuffer[testId].c_str()))
return 0;
return ret;
}

static void intRefBuilder(printDataGenParameters& params, char* refResult, const size_t refSize)
Expand All @@ -1776,13 +1789,27 @@ static void floatRefBuilder(printDataGenParameters& params, char* refResult, con
strtof(params.dataRepresentation, NULL));
}

static bool floatRefTest(const char* refResult, const char* analysisBuffer)
{
float test = strtof(analysisBuffer, NULL);
float expected = strtof(refResult, NULL);
return test == expected;
}

static void doubleRefBuilder(printDataGenParameters& params, char* refResult,
const size_t refSize)
{
snprintf(refResult, refSize, params.genericFormats.front().c_str(),
strtod(params.dataRepresentation, NULL));
}

static bool doubleRefTest(const char* refResult, const char* analysisBuffer)
{
double test = strtod(analysisBuffer, NULL);
double expected = strtod(refResult, NULL);
return test == expected;
}

static void octalRefBuilder(printDataGenParameters& params, char* refResult, const size_t refSize)
{
const unsigned long int data = strtoul(params.dataRepresentation, NULL, 10);
Expand Down