Commit 57556df9 authored by Frank Tang's avatar Frank Tang Committed by V8 LUCI CQ

Fix RISC-V build problem and mark N5X test skip

Fix build breakage of
https://ci.chromium.org/p/v8/builders/ci/V8%20Linux%20-%20riscv64%20-%20sim%20-%20builder/7023
and
Mark some test SKIP on arm64 for
https://ci.chromium.org/p/v8/builders/ci/V8%20Android%20Arm64%20-%20N5X/17069

Bug: v8:10776
Change-Id: Ia24d7b7397bd48599a63b3a674312b09d1f65ee6
Cq-Include-Trybots: luci.v8.try:v8_linux64_riscv64_rel_ng,v8_android_arm64_n5x_rel_ng
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3427297Reviewed-by: 's avatarShu-yu Guo <syg@chromium.org>
Commit-Queue: Frank Tang <ftang@chromium.org>
Cr-Commit-Position: refs/heads/main@{#78894}
parent cb12a3e4
...@@ -102,7 +102,9 @@ enum class SignDisplay { ...@@ -102,7 +102,9 @@ enum class SignDisplay {
// [[RoundingMode]] is one of the String values "ceil", "floor", "expand", // [[RoundingMode]] is one of the String values "ceil", "floor", "expand",
// "trunc", "halfCeil", "halfFloor", "halfExpand", "halfTrunc", or "halfEven", // "trunc", "halfCeil", "halfFloor", "halfExpand", "halfTrunc", or "halfEven",
// specifying the rounding strategy for the number. // specifying the rounding strategy for the number.
enum class RoundingMode { // Note: To avoid name conflict with RoundingMode defined in other places,
// prefix with Intl as IntlRoundingMode
enum class IntlRoundingMode {
CEIL, CEIL,
FLOOR, FLOOR,
EXPAND, EXPAND,
...@@ -207,25 +209,25 @@ icu::number::Notation ToICUNotation(Notation notation, ...@@ -207,25 +209,25 @@ icu::number::Notation ToICUNotation(Notation notation,
} }
UNumberFormatRoundingMode ToUNumberFormatRoundingMode( UNumberFormatRoundingMode ToUNumberFormatRoundingMode(
RoundingMode rounding_mode) { IntlRoundingMode rounding_mode) {
switch (rounding_mode) { switch (rounding_mode) {
case RoundingMode::CEIL: case IntlRoundingMode::CEIL:
return UNumberFormatRoundingMode::UNUM_ROUND_CEILING; return UNumberFormatRoundingMode::UNUM_ROUND_CEILING;
case RoundingMode::FLOOR: case IntlRoundingMode::FLOOR:
return UNumberFormatRoundingMode::UNUM_ROUND_FLOOR; return UNumberFormatRoundingMode::UNUM_ROUND_FLOOR;
case RoundingMode::EXPAND: case IntlRoundingMode::EXPAND:
return UNumberFormatRoundingMode::UNUM_ROUND_UP; return UNumberFormatRoundingMode::UNUM_ROUND_UP;
case RoundingMode::TRUNC: case IntlRoundingMode::TRUNC:
return UNumberFormatRoundingMode::UNUM_ROUND_DOWN; return UNumberFormatRoundingMode::UNUM_ROUND_DOWN;
case RoundingMode::HALF_CEIL: case IntlRoundingMode::HALF_CEIL:
return UNumberFormatRoundingMode::UNUM_ROUND_HALF_CEILING; return UNumberFormatRoundingMode::UNUM_ROUND_HALF_CEILING;
case RoundingMode::HALF_FLOOR: case IntlRoundingMode::HALF_FLOOR:
return UNumberFormatRoundingMode::UNUM_ROUND_HALF_FLOOR; return UNumberFormatRoundingMode::UNUM_ROUND_HALF_FLOOR;
case RoundingMode::HALF_EXPAND: case IntlRoundingMode::HALF_EXPAND:
return UNumberFormatRoundingMode::UNUM_ROUND_HALFUP; return UNumberFormatRoundingMode::UNUM_ROUND_HALFUP;
case RoundingMode::HALF_TRUNC: case IntlRoundingMode::HALF_TRUNC:
return UNumberFormatRoundingMode::UNUM_ROUND_HALFDOWN; return UNumberFormatRoundingMode::UNUM_ROUND_HALFDOWN;
case RoundingMode::HALF_EVEN: case IntlRoundingMode::HALF_EVEN:
return UNumberFormatRoundingMode::UNUM_ROUND_HALFEVEN; return UNumberFormatRoundingMode::UNUM_ROUND_HALFEVEN;
} }
} }
...@@ -1412,17 +1414,19 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate, ...@@ -1412,17 +1414,19 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
// « "ceil", "floor", "expand", "trunc", "halfCeil", "halfFloor", // « "ceil", "floor", "expand", "trunc", "halfCeil", "halfFloor",
// "halfExpand", "halfTrunc", "halfEven" », // "halfExpand", "halfTrunc", "halfEven" »,
// "halfExpand"). // "halfExpand").
Maybe<RoundingMode> maybe_rounding_mode = GetStringOption<RoundingMode>( Maybe<IntlRoundingMode> maybe_rounding_mode =
isolate, options, "roundingMode", service, GetStringOption<IntlRoundingMode>(
{"ceil", "floor", "expand", "trunc", "halfCeil", "halfFloor", isolate, options, "roundingMode", service,
"halfExpand", "halfTrunc", "halfEven"}, {"ceil", "floor", "expand", "trunc", "halfCeil", "halfFloor",
{RoundingMode::CEIL, RoundingMode::FLOOR, RoundingMode::EXPAND, "halfExpand", "halfTrunc", "halfEven"},
RoundingMode::TRUNC, RoundingMode::HALF_CEIL, RoundingMode::HALF_FLOOR, {IntlRoundingMode::CEIL, IntlRoundingMode::FLOOR,
RoundingMode::HALF_EXPAND, RoundingMode::HALF_TRUNC, IntlRoundingMode::EXPAND, IntlRoundingMode::TRUNC,
RoundingMode::HALF_EVEN}, IntlRoundingMode::HALF_CEIL, IntlRoundingMode::HALF_FLOOR,
RoundingMode::HALF_EXPAND); IntlRoundingMode::HALF_EXPAND, IntlRoundingMode::HALF_TRUNC,
IntlRoundingMode::HALF_EVEN},
IntlRoundingMode::HALF_EXPAND);
MAYBE_RETURN(maybe_rounding_mode, MaybeHandle<JSNumberFormat>()); MAYBE_RETURN(maybe_rounding_mode, MaybeHandle<JSNumberFormat>());
RoundingMode rounding_mode = maybe_rounding_mode.FromJust(); IntlRoundingMode rounding_mode = maybe_rounding_mode.FromJust();
settings = settings =
settings.roundingMode(ToUNumberFormatRoundingMode(rounding_mode)); settings.roundingMode(ToUNumberFormatRoundingMode(rounding_mode));
} }
......
...@@ -2799,6 +2799,14 @@ ...@@ -2799,6 +2799,14 @@
'language/identifiers/start-unicode-9*': [FAIL], 'language/identifiers/start-unicode-9*': [FAIL],
}], # no_i18n == True }], # no_i18n == True
['arch == arm64', {
# Problem in V8 Android Arm64 - N5X
'intl402/NumberFormat/prototype/format/format-rounding-increment-1000': [SKIP],
'intl402/NumberFormat/prototype/format/format-rounding-increment-2000': [SKIP],
'intl402/NumberFormat/prototype/format/format-rounding-increment-2500': [SKIP],
'intl402/NumberFormat/prototype/format/format-rounding-increment-5000': [SKIP],
}], # 'arch == arm64'
['arch == arm or arch == mipsel or arch == mips or arch == arm64 or arch == mips64 or arch == mips64el', { ['arch == arm or arch == mipsel or arch == mips or arch == arm64 or arch == mips64 or arch == mips64el', {
# Causes stack overflow on simulators due to eager compilation of # Causes stack overflow on simulators due to eager compilation of
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment