⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 219124 in webkit


Ignore:
Timestamp:
Jul 4, 2017, 5:59:11 PM (9 years ago)
Author:
Yusuke Suzuki
Message:

[WTF] Make double-conversion's cache data constant and drop double_conversion::initialize()
​https://bugs.webkit.org/show_bug.cgi?id=174124

Reviewed by Saam Barati.

We annotate double-conversion's cache data as const and constexpr. And move it out of function.
Since they are not involving global constructors, they are compiled as rodata and initialized
without calling double_conversion::initialize().

And we drop double_conversion::initialize() function since it is no longer necessary.

  • wtf/Threading.cpp:

(WTF::initializeThreading):

  • wtf/dtoa/cached-powers.cc:
  • wtf/dtoa/cached-powers.h:
Location:
trunk/Source/WTF
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r219119 r219124  
     12017-07-04  Yusuke Suzuki  <utatane.tea@gmail.com>
     2
     3        [WTF] Make double-conversion's cache data constant and drop double_conversion::initialize()
     4        https://bugs.webkit.org/show_bug.cgi?id=174124
     5
     6        Reviewed by Saam Barati.
     7
     8        We annotate double-conversion's cache data as const and constexpr. And move it out of function.
     9        Since they are not involving global constructors, they are compiled as rodata and initialized
     10        without calling double_conversion::initialize().
     11
     12        And we drop double_conversion::initialize() function since it is no longer necessary.
     13
     14        * wtf/Threading.cpp:
     15        (WTF::initializeThreading):
     16        * wtf/dtoa/cached-powers.cc:
     17        * wtf/dtoa/cached-powers.h:
     18
    1192017-07-04  Yusuke Suzuki  <utatane.tea@gmail.com>
    220

  • trunk/Source/WTF/wtf/Threading.cpp

    r219105 r219124  
    166166    static std::once_flag initializeKey;
    167167    std::call_once(initializeKey, [] {
    168         WTF::double_conversion::initialize();
    169168        ThreadHolder::initializeOnce();
    170169        // StringImpl::empty() does not construct its static string in a threadsafe fashion,

  • trunk/Source/WTF/wtf/dtoa/cached-powers.cc

    r156042 r219124  
    4545    };
    4646   
    47     static int kCachedPowersLength = 1;
    48     static int kCachedPowersOffset = 1;
    49     static const double kD_1_LOG2_10 = 0.30102999566398114;  //  1 / lg(10)
    50     static const CachedPower* kCachedPowers = 0;
     47    constexpr static const double kD_1_LOG2_10 = 0.30102999566398114;  //  1 / lg(10)
     48    constexpr static const CachedPower kCachedPowers[] = {
     49        {UINT64_2PART_C(0xfa8fd5a0, 081c0288), -1220, -348},
     50        {UINT64_2PART_C(0xbaaee17f, a23ebf76), -1193, -340},
     51        {UINT64_2PART_C(0x8b16fb20, 3055ac76), -1166, -332},
     52        {UINT64_2PART_C(0xcf42894a, 5dce35ea), -1140, -324},
     53        {UINT64_2PART_C(0x9a6bb0aa, 55653b2d), -1113, -316},
     54        {UINT64_2PART_C(0xe61acf03, 3d1a45df), -1087, -308},
     55        {UINT64_2PART_C(0xab70fe17, c79ac6ca), -1060, -300},
     56        {UINT64_2PART_C(0xff77b1fc, bebcdc4f), -1034, -292},
     57        {UINT64_2PART_C(0xbe5691ef, 416bd60c), -1007, -284},
     58        {UINT64_2PART_C(0x8dd01fad, 907ffc3c), -980, -276},
     59        {UINT64_2PART_C(0xd3515c28, 31559a83), -954, -268},
     60        {UINT64_2PART_C(0x9d71ac8f, ada6c9b5), -927, -260},
     61        {UINT64_2PART_C(0xea9c2277, 23ee8bcb), -901, -252},
     62        {UINT64_2PART_C(0xaecc4991, 4078536d), -874, -244},
     63        {UINT64_2PART_C(0x823c1279, 5db6ce57), -847, -236},
     64        {UINT64_2PART_C(0xc2109436, 4dfb5637), -821, -228},
     65        {UINT64_2PART_C(0x9096ea6f, 3848984f), -794, -220},
     66        {UINT64_2PART_C(0xd77485cb, 25823ac7), -768, -212},
     67        {UINT64_2PART_C(0xa086cfcd, 97bf97f4), -741, -204},
     68        {UINT64_2PART_C(0xef340a98, 172aace5), -715, -196},
     69        {UINT64_2PART_C(0xb23867fb, 2a35b28e), -688, -188},
     70        {UINT64_2PART_C(0x84c8d4df, d2c63f3b), -661, -180},
     71        {UINT64_2PART_C(0xc5dd4427, 1ad3cdba), -635, -172},
     72        {UINT64_2PART_C(0x936b9fce, bb25c996), -608, -164},
     73        {UINT64_2PART_C(0xdbac6c24, 7d62a584), -582, -156},
     74        {UINT64_2PART_C(0xa3ab6658, 0d5fdaf6), -555, -148},
     75        {UINT64_2PART_C(0xf3e2f893, dec3f126), -529, -140},
     76        {UINT64_2PART_C(0xb5b5ada8, aaff80b8), -502, -132},
     77        {UINT64_2PART_C(0x87625f05, 6c7c4a8b), -475, -124},
     78        {UINT64_2PART_C(0xc9bcff60, 34c13053), -449, -116},
     79        {UINT64_2PART_C(0x964e858c, 91ba2655), -422, -108},
     80        {UINT64_2PART_C(0xdff97724, 70297ebd), -396, -100},
     81        {UINT64_2PART_C(0xa6dfbd9f, b8e5b88f), -369, -92},
     82        {UINT64_2PART_C(0xf8a95fcf, 88747d94), -343, -84},
     83        {UINT64_2PART_C(0xb9447093, 8fa89bcf), -316, -76},
     84        {UINT64_2PART_C(0x8a08f0f8, bf0f156b), -289, -68},
     85        {UINT64_2PART_C(0xcdb02555, 653131b6), -263, -60},
     86        {UINT64_2PART_C(0x993fe2c6, d07b7fac), -236, -52},
     87        {UINT64_2PART_C(0xe45c10c4, 2a2b3b06), -210, -44},
     88        {UINT64_2PART_C(0xaa242499, 697392d3), -183, -36},
     89        {UINT64_2PART_C(0xfd87b5f2, 8300ca0e), -157, -28},
     90        {UINT64_2PART_C(0xbce50864, 92111aeb), -130, -20},
     91        {UINT64_2PART_C(0x8cbccc09, 6f5088cc), -103, -12},
     92        {UINT64_2PART_C(0xd1b71758, e219652c), -77, -4},
     93        {UINT64_2PART_C(0x9c400000, 00000000), -50, 4},
     94        {UINT64_2PART_C(0xe8d4a510, 00000000), -24, 12},
     95        {UINT64_2PART_C(0xad78ebc5, ac620000), 3, 20},
     96        {UINT64_2PART_C(0x813f3978, f8940984), 30, 28},
     97        {UINT64_2PART_C(0xc097ce7b, c90715b3), 56, 36},
     98        {UINT64_2PART_C(0x8f7e32ce, 7bea5c70), 83, 44},
     99        {UINT64_2PART_C(0xd5d238a4, abe98068), 109, 52},
     100        {UINT64_2PART_C(0x9f4f2726, 179a2245), 136, 60},
     101        {UINT64_2PART_C(0xed63a231, d4c4fb27), 162, 68},
     102        {UINT64_2PART_C(0xb0de6538, 8cc8ada8), 189, 76},
     103        {UINT64_2PART_C(0x83c7088e, 1aab65db), 216, 84},
     104        {UINT64_2PART_C(0xc45d1df9, 42711d9a), 242, 92},
     105        {UINT64_2PART_C(0x924d692c, a61be758), 269, 100},
     106        {UINT64_2PART_C(0xda01ee64, 1a708dea), 295, 108},
     107        {UINT64_2PART_C(0xa26da399, 9aef774a), 322, 116},
     108        {UINT64_2PART_C(0xf209787b, b47d6b85), 348, 124},
     109        {UINT64_2PART_C(0xb454e4a1, 79dd1877), 375, 132},
     110        {UINT64_2PART_C(0x865b8692, 5b9bc5c2), 402, 140},
     111        {UINT64_2PART_C(0xc83553c5, c8965d3d), 428, 148},
     112        {UINT64_2PART_C(0x952ab45c, fa97a0b3), 455, 156},
     113        {UINT64_2PART_C(0xde469fbd, 99a05fe3), 481, 164},
     114        {UINT64_2PART_C(0xa59bc234, db398c25), 508, 172},
     115        {UINT64_2PART_C(0xf6c69a72, a3989f5c), 534, 180},
     116        {UINT64_2PART_C(0xb7dcbf53, 54e9bece), 561, 188},
     117        {UINT64_2PART_C(0x88fcf317, f22241e2), 588, 196},
     118        {UINT64_2PART_C(0xcc20ce9b, d35c78a5), 614, 204},
     119        {UINT64_2PART_C(0x98165af3, 7b2153df), 641, 212},
     120        {UINT64_2PART_C(0xe2a0b5dc, 971f303a), 667, 220},
     121        {UINT64_2PART_C(0xa8d9d153, 5ce3b396), 694, 228},
     122        {UINT64_2PART_C(0xfb9b7cd9, a4a7443c), 720, 236},
     123        {UINT64_2PART_C(0xbb764c4c, a7a44410), 747, 244},
     124        {UINT64_2PART_C(0x8bab8eef, b6409c1a), 774, 252},
     125        {UINT64_2PART_C(0xd01fef10, a657842c), 800, 260},
     126        {UINT64_2PART_C(0x9b10a4e5, e9913129), 827, 268},
     127        {UINT64_2PART_C(0xe7109bfb, a19c0c9d), 853, 276},
     128        {UINT64_2PART_C(0xac2820d9, 623bf429), 880, 284},
     129        {UINT64_2PART_C(0x80444b5e, 7aa7cf85), 907, 292},
     130        {UINT64_2PART_C(0xbf21e440, 03acdd2d), 933, 300},
     131        {UINT64_2PART_C(0x8e679c2f, 5e44ff8f), 960, 308},
     132        {UINT64_2PART_C(0xd433179d, 9c8cb841), 986, 316},
     133        {UINT64_2PART_C(0x9e19db92, b4e31ba9), 1013, 324},
     134        {UINT64_2PART_C(0xeb96bf6e, badf77d9), 1039, 332},
     135        {UINT64_2PART_C(0xaf87023b, 9bf0ee6b), 1066, 340},
     136    };
     137    constexpr static const int kCachedPowersLength { ARRAY_SIZE(kCachedPowers) };
     138    constexpr static const int kCachedPowersOffset { -kCachedPowers[0].decimal_exponent };
    51139   
    52     int PowersOfTenCache::kDecimalExponentDistance = 1;
    53     int PowersOfTenCache::kMinDecimalExponent = 1;
    54     int PowersOfTenCache::kMaxDecimalExponent = 1;
    55    
    56     void initialize() {
    57         if (kCachedPowers)
    58             return;
    59         static const CachedPower cachedPowers[] = {
    60             {UINT64_2PART_C(0xfa8fd5a0, 081c0288), -1220, -348},
    61             {UINT64_2PART_C(0xbaaee17f, a23ebf76), -1193, -340},
    62             {UINT64_2PART_C(0x8b16fb20, 3055ac76), -1166, -332},
    63             {UINT64_2PART_C(0xcf42894a, 5dce35ea), -1140, -324},
    64             {UINT64_2PART_C(0x9a6bb0aa, 55653b2d), -1113, -316},
    65             {UINT64_2PART_C(0xe61acf03, 3d1a45df), -1087, -308},
    66             {UINT64_2PART_C(0xab70fe17, c79ac6ca), -1060, -300},
    67             {UINT64_2PART_C(0xff77b1fc, bebcdc4f), -1034, -292},
    68             {UINT64_2PART_C(0xbe5691ef, 416bd60c), -1007, -284},
    69             {UINT64_2PART_C(0x8dd01fad, 907ffc3c), -980, -276},
    70             {UINT64_2PART_C(0xd3515c28, 31559a83), -954, -268},
    71             {UINT64_2PART_C(0x9d71ac8f, ada6c9b5), -927, -260},
    72             {UINT64_2PART_C(0xea9c2277, 23ee8bcb), -901, -252},
    73             {UINT64_2PART_C(0xaecc4991, 4078536d), -874, -244},
    74             {UINT64_2PART_C(0x823c1279, 5db6ce57), -847, -236},
    75             {UINT64_2PART_C(0xc2109436, 4dfb5637), -821, -228},
    76             {UINT64_2PART_C(0x9096ea6f, 3848984f), -794, -220},
    77             {UINT64_2PART_C(0xd77485cb, 25823ac7), -768, -212},
    78             {UINT64_2PART_C(0xa086cfcd, 97bf97f4), -741, -204},
    79             {UINT64_2PART_C(0xef340a98, 172aace5), -715, -196},
    80             {UINT64_2PART_C(0xb23867fb, 2a35b28e), -688, -188},
    81             {UINT64_2PART_C(0x84c8d4df, d2c63f3b), -661, -180},
    82             {UINT64_2PART_C(0xc5dd4427, 1ad3cdba), -635, -172},
    83             {UINT64_2PART_C(0x936b9fce, bb25c996), -608, -164},
    84             {UINT64_2PART_C(0xdbac6c24, 7d62a584), -582, -156},
    85             {UINT64_2PART_C(0xa3ab6658, 0d5fdaf6), -555, -148},
    86             {UINT64_2PART_C(0xf3e2f893, dec3f126), -529, -140},
    87             {UINT64_2PART_C(0xb5b5ada8, aaff80b8), -502, -132},
    88             {UINT64_2PART_C(0x87625f05, 6c7c4a8b), -475, -124},
    89             {UINT64_2PART_C(0xc9bcff60, 34c13053), -449, -116},
    90             {UINT64_2PART_C(0x964e858c, 91ba2655), -422, -108},
    91             {UINT64_2PART_C(0xdff97724, 70297ebd), -396, -100},
    92             {UINT64_2PART_C(0xa6dfbd9f, b8e5b88f), -369, -92},
    93             {UINT64_2PART_C(0xf8a95fcf, 88747d94), -343, -84},
    94             {UINT64_2PART_C(0xb9447093, 8fa89bcf), -316, -76},
    95             {UINT64_2PART_C(0x8a08f0f8, bf0f156b), -289, -68},
    96             {UINT64_2PART_C(0xcdb02555, 653131b6), -263, -60},
    97             {UINT64_2PART_C(0x993fe2c6, d07b7fac), -236, -52},
    98             {UINT64_2PART_C(0xe45c10c4, 2a2b3b06), -210, -44},
    99             {UINT64_2PART_C(0xaa242499, 697392d3), -183, -36},
    100             {UINT64_2PART_C(0xfd87b5f2, 8300ca0e), -157, -28},
    101             {UINT64_2PART_C(0xbce50864, 92111aeb), -130, -20},
    102             {UINT64_2PART_C(0x8cbccc09, 6f5088cc), -103, -12},
    103             {UINT64_2PART_C(0xd1b71758, e219652c), -77, -4},
    104             {UINT64_2PART_C(0x9c400000, 00000000), -50, 4},
    105             {UINT64_2PART_C(0xe8d4a510, 00000000), -24, 12},
    106             {UINT64_2PART_C(0xad78ebc5, ac620000), 3, 20},
    107             {UINT64_2PART_C(0x813f3978, f8940984), 30, 28},
    108             {UINT64_2PART_C(0xc097ce7b, c90715b3), 56, 36},
    109             {UINT64_2PART_C(0x8f7e32ce, 7bea5c70), 83, 44},
    110             {UINT64_2PART_C(0xd5d238a4, abe98068), 109, 52},
    111             {UINT64_2PART_C(0x9f4f2726, 179a2245), 136, 60},
    112             {UINT64_2PART_C(0xed63a231, d4c4fb27), 162, 68},
    113             {UINT64_2PART_C(0xb0de6538, 8cc8ada8), 189, 76},
    114             {UINT64_2PART_C(0x83c7088e, 1aab65db), 216, 84},
    115             {UINT64_2PART_C(0xc45d1df9, 42711d9a), 242, 92},
    116             {UINT64_2PART_C(0x924d692c, a61be758), 269, 100},
    117             {UINT64_2PART_C(0xda01ee64, 1a708dea), 295, 108},
    118             {UINT64_2PART_C(0xa26da399, 9aef774a), 322, 116},
    119             {UINT64_2PART_C(0xf209787b, b47d6b85), 348, 124},
    120             {UINT64_2PART_C(0xb454e4a1, 79dd1877), 375, 132},
    121             {UINT64_2PART_C(0x865b8692, 5b9bc5c2), 402, 140},
    122             {UINT64_2PART_C(0xc83553c5, c8965d3d), 428, 148},
    123             {UINT64_2PART_C(0x952ab45c, fa97a0b3), 455, 156},
    124             {UINT64_2PART_C(0xde469fbd, 99a05fe3), 481, 164},
    125             {UINT64_2PART_C(0xa59bc234, db398c25), 508, 172},
    126             {UINT64_2PART_C(0xf6c69a72, a3989f5c), 534, 180},
    127             {UINT64_2PART_C(0xb7dcbf53, 54e9bece), 561, 188},
    128             {UINT64_2PART_C(0x88fcf317, f22241e2), 588, 196},
    129             {UINT64_2PART_C(0xcc20ce9b, d35c78a5), 614, 204},
    130             {UINT64_2PART_C(0x98165af3, 7b2153df), 641, 212},
    131             {UINT64_2PART_C(0xe2a0b5dc, 971f303a), 667, 220},
    132             {UINT64_2PART_C(0xa8d9d153, 5ce3b396), 694, 228},
    133             {UINT64_2PART_C(0xfb9b7cd9, a4a7443c), 720, 236},
    134             {UINT64_2PART_C(0xbb764c4c, a7a44410), 747, 244},
    135             {UINT64_2PART_C(0x8bab8eef, b6409c1a), 774, 252},
    136             {UINT64_2PART_C(0xd01fef10, a657842c), 800, 260},
    137             {UINT64_2PART_C(0x9b10a4e5, e9913129), 827, 268},
    138             {UINT64_2PART_C(0xe7109bfb, a19c0c9d), 853, 276},
    139             {UINT64_2PART_C(0xac2820d9, 623bf429), 880, 284},
    140             {UINT64_2PART_C(0x80444b5e, 7aa7cf85), 907, 292},
    141             {UINT64_2PART_C(0xbf21e440, 03acdd2d), 933, 300},
    142             {UINT64_2PART_C(0x8e679c2f, 5e44ff8f), 960, 308},
    143             {UINT64_2PART_C(0xd433179d, 9c8cb841), 986, 316},
    144             {UINT64_2PART_C(0x9e19db92, b4e31ba9), 1013, 324},
    145             {UINT64_2PART_C(0xeb96bf6e, badf77d9), 1039, 332},
    146             {UINT64_2PART_C(0xaf87023b, 9bf0ee6b), 1066, 340},
    147         };
    148         kCachedPowers = cachedPowers;
    149         kCachedPowersLength = ARRAY_SIZE(cachedPowers);
    150         kCachedPowersOffset = -cachedPowers[0].decimal_exponent;
    151         PowersOfTenCache::kDecimalExponentDistance = kCachedPowers[1].decimal_exponent - kCachedPowers[0].decimal_exponent;
    152         PowersOfTenCache::kMinDecimalExponent = kCachedPowers[0].decimal_exponent;
    153         PowersOfTenCache::kMaxDecimalExponent = kCachedPowers[kCachedPowersLength - 1].decimal_exponent;
    154     }
     140    const int PowersOfTenCache::kDecimalExponentDistance { kCachedPowers[1].decimal_exponent - kCachedPowers[0].decimal_exponent };
     141    const int PowersOfTenCache::kMinDecimalExponent { kCachedPowers[0].decimal_exponent };
     142    const int PowersOfTenCache::kMaxDecimalExponent { kCachedPowers[kCachedPowersLength - 1].decimal_exponent };
    155143   
    156144    void PowersOfTenCache::GetCachedPowerForBinaryExponentRange(

  • trunk/Source/WTF/wtf/dtoa/cached-powers.h

    r150995 r219124  
    4040        // Not all powers of ten are cached. The decimal exponent of two neighboring
    4141        // cached numbers will differ by kDecimalExponentDistance.
    42         static int kDecimalExponentDistance;
     42        static const int kDecimalExponentDistance;
    4343       
    44         static int kMinDecimalExponent;
    45         static int kMaxDecimalExponent;
     44        static const int kMinDecimalExponent;
     45        static const int kMaxDecimalExponent;
    4646       
    4747        // Returns a cached power-of-ten with a binary exponent in the range
    … …  
    6262    };
    6363   
    64     // Initializes the table of cached powers used by the dtoa algorithm.
    65     // This needs to be called when JSC is being initialized.
    66     WTF_EXPORT_PRIVATE void initialize();
    67    
    6864}  // namespace double_conversion
    6965
Note: See TracChangeset for help on using the changeset viewer.