David Eichmann pushed to branch wip/davide/windows-dlls_sysm-test_master at Glasgow Haskell Compiler / GHC

Commits:

8 changed files:

Changes:

  • rts/RtsSymbols.c
    ... ... @@ -1220,13 +1220,13 @@ RTS_SYMBOLS_PRIM
    1220 1220
     /* See Note [Naming Scheme for Symbol Macros] */
    
    1221 1221
     
    
    1222 1222
     #define SymI_HasProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \
    
    1223
    -                    (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_CODE },
    
    1223
    +                    (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_CODE, NULL },
    
    1224 1224
     #define SymI_HasDataProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \
    
    1225
    -                    (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_DATA },
    
    1225
    +                    (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_DATA, NULL },
    
    1226 1226
     #define SymE_HasProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \
    
    1227
    -            (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_CODE },
    
    1227
    +            (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_CODE, NULL },
    
    1228 1228
     #define SymE_HasDataProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \
    
    1229
    -            (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_DATA },
    
    1229
    +            (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_DATA, NULL },
    
    1230 1230
     
    
    1231 1231
     #define SymI_NeedsProto(vvv) SymI_HasProto(vvv)
    
    1232 1232
     #define SymI_NeedsDataProto(vvv) SymI_HasDataProto(vvv)
    
    ... ... @@ -1237,7 +1237,7 @@ RTS_SYMBOLS_PRIM
    1237 1237
     // another symbol.  See newCAF/newRetainedCAF/newGCdCAF for an example.
    
    1238 1238
     #define SymI_HasProto_redirect(vvv,xxx,strength,ty) \
    
    1239 1239
         { MAYBE_LEADING_UNDERSCORE_STR(#vvv),    \
    
    1240
    -      (void*)(&(xxx)), strength, ty },
    
    1240
    +      (void*)(&(xxx)), strength, ty, MAYBE_LEADING_UNDERSCORE_STR(#xxx) },
    
    1241 1241
     
    
    1242 1242
     static RtsSymbolVal * rtsSyms = NULL;
    
    1243 1243
     
    
    ... ... @@ -1264,7 +1264,7 @@ RtsSymbolVal const * getRtsSymbols(void) {
    1264 1264
                       RTS_ARM_OUTLINE_ATOMIC_SYMBOLS
    
    1265 1265
                       RTS_SYMBOLS_PRIM
    
    1266 1266
                       SymI_HasDataProto(nonmoving_write_barrier_enabled)
    
    1267
    -                  { 0, 0, STRENGTH_NORMAL, SYM_TYPE_CODE } /* sentinel */
    
    1267
    +                  { 0, 0, STRENGTH_NORMAL, SYM_TYPE_CODE, NULL } /* sentinel */
    
    1268 1268
                 };
    
    1269 1269
     
    
    1270 1270
                 uint32_t n = 1;
    
    ... ... @@ -1362,7 +1362,7 @@ RtsSymbolVal const * getRtsSymbols(void) {
    1362 1362
     //          CODE_SYM(getauxval)
    
    1363 1363
     //          CODE_SYM(posix_spawn_file_actions_init)
    
    1364 1364
     //          ...
    
    1365
    -//          { 0, 0, STRENGTH_NORMAL, SYM_TYPE_CODE } /* sentinel */
    
    1365
    +//          { 0, 0, STRENGTH_NORMAL, SYM_TYPE_CODE, NULL } /* sentinel */
    
    1366 1366
     //      };
    
    1367 1367
     //
    
    1368 1368
     //      RtsSymbolVal* rtsExtraSyms() {
    
    ... ... @@ -1375,7 +1375,7 @@ RtsSymbolVal const * getRtsSymbols(void) {
    1375 1375
     //
    
    1376 1376
     
    
    1377 1377
     static RtsSymbolVal default_extra_syms[] = {
    
    1378
    -      { 0, 0, STRENGTH_NORMAL, SYM_TYPE_CODE } /* sentinel */
    
    1378
    +      { 0, 0, STRENGTH_NORMAL, SYM_TYPE_CODE, NULL } /* sentinel */
    
    1379 1379
     };
    
    1380 1380
     
    
    1381 1381
     /* Default empty extra RTS symbols. See Note[Extra RTS symbols] */
    

  • rts/include/rts/RtsSymbols.h
    ... ... @@ -8,6 +8,7 @@
    8 8
     
    
    9 9
     #pragma once
    
    10 10
     
    
    11
    +#include <stdbool.h>
    
    11 12
     typedef void SymbolAddr;
    
    12 13
     typedef char SymbolName;
    
    13 14
     
    
    ... ... @@ -36,6 +37,9 @@ typedef struct _RtsSymbolVal {
    36 37
         SymbolAddr* addr;
    
    37 38
         SymStrength strength;
    
    38 39
         SymType type;
    
    40
    +    // If this is a redirection, then this is the lable of the
    
    41
    +    // target symbol. Otherwise NULL.
    
    42
    +    const SymbolName* lbl_redirect_target;
    
    39 43
     } RtsSymbolVal;
    
    40 44
     
    
    41 45
     RtsSymbolVal const * getRtsSymbols(void);

  • testsuite/tests/ghci/linking/T25155_iserv_main.c
    ... ... @@ -23,7 +23,7 @@ int main (int argc, char *argv[])
    23 23
     // can use the FFI call to foobar in a TH splice.
    
    24 24
     
    
    25 25
     #define SymI_HasProto(vvv) { MAYBE_LEADING_UNDERSCORE_STR(#vvv), \
    
    26
    -                    (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_CODE },
    
    26
    +                    (void*)(&(vvv)), STRENGTH_NORMAL, SYM_TYPE_CODE, NULL },
    
    27 27
     
    
    28 28
     
    
    29 29
     void foobar(int x) {
    

  • testsuite/tests/rts/symbols/Main.hs
    ... ... @@ -19,18 +19,26 @@ main = do
    19 19
              -- want to avoid copying that logic again in the test. So we just ignore some
    
    20 20
              -- symbols so that CI can pass and in the future we aim to fix RtsSymbols.c and
    
    21 21
              -- reduce the size of ignoredSymbols.
    
    22
    -         ignoreSymbols <- S.fromList
    
    22
    +         ignoreSymbols' <- S.fromList
    
    23 23
                                . filter (not . null)
    
    24 24
                                . lines
    
    25 25
                                <$> readFile ignoreSymbolsFile
    
    26 26
     
    
    27
    +         let symbolFilter :: String -> CodeOrData -> Bool
    
    28
    +             symbolFilter name cd =
    
    29
    +               -- Not in ingore list
    
    30
    +               not (S.member name ignoreSymbols')
    
    31
    +               -- Doesn't look like a entry code symbol
    
    32
    +               -- (These can appear in unregisterd builds wihere tables next to code is disabled)
    
    33
    +               && not ("_entry" `isSuffixOf` name && cd == Code)
    
    34
    +
    
    27 35
              declaredSymbolsStr <- readFile declaredSymbolsFile
    
    28 36
              observedSymbolsStr <- readFile observedSymbolsFile
    
    29 37
     
    
    30
    -         let declaredSymbols = readCodeOrData <$> linePairs declaredSymbolsStr
    
    31
    -         let observedSymbols = parseReadelf observedSymbolsStr
    
    38
    +         let declaredSymbols = M.filterWithKey symbolFilter $ readCodeOrData <$> linePairs declaredSymbolsStr
    
    39
    +         let observedSymbols = M.filterWithKey symbolFilter $ parseReadelf observedSymbolsStr
    
    32 40
     
    
    33
    -         let diffStr = diff ignoreSymbols declaredSymbols observedSymbols
    
    41
    +         let diffStr = diff declaredSymbols observedSymbols
    
    34 42
              -- writeFile "<ghc root>/testsuite/tests/rts/symbols/rts-check-symbols.stdout"
    
    35 43
              putStrLn diffStr
    
    36 44
     
    
    ... ... @@ -44,8 +52,8 @@ data CodeOrData = Code | Data
    44 52
     
    
    45 53
     -- Compare observedSymbols (symbols observed in the DSO) to declaredSymbols
    
    46 54
     -- (symbols declared in RtsSymbols.c)
    
    47
    -diff :: S.Set String -> M.Map String CodeOrData -> M.Map String CodeOrData -> String
    
    48
    -diff ignoreSymbols declaredSymbolsAll observedSymbolsAll = unlines $
    
    55
    +diff :: M.Map String CodeOrData -> M.Map String CodeOrData -> String
    
    56
    +diff declaredSymbols observedSymbols = unlines $
    
    49 57
           [ "Symbols declared in RtsSymbols.c but not observed in the DSO:" ]
    
    50 58
        ++ [ "Declared> " ++ k ++ " " ++ show v | (k, v) <- M.toList diffInDeclaredSymbols ]
    
    51 59
        ++ [ "" ]
    
    ... ... @@ -56,10 +64,6 @@ diff ignoreSymbols declaredSymbolsAll observedSymbolsAll = unlines $
    56 64
        ++ [ "WrongType> " ++ k ++ " (declared, observed): (" ++ show declared ++ ", " ++ show observed ++ ")"
    
    57 65
              | (k, (declared, observed)) <- M.toList diffOnType ]
    
    58 66
        where
    
    59
    -      -- Ignore some symbols
    
    60
    -      declaredSymbols = declaredSymbolsAll `M.withoutKeys` ignoreSymbols
    
    61
    -      observedSymbols = observedSymbolsAll `M.withoutKeys` ignoreSymbols
    
    62
    -
    
    63 67
           -- Undeclared observed symbols
    
    64 68
           diffInObservedSymbols :: M.Map String CodeOrData
    
    65 69
           diffInObservedSymbols = observedSymbols M.\\ declaredSymbols
    

  • testsuite/tests/rts/symbols/all.T
    1 1
     test('rts-check-symbols', [
    
    2
    -    unless(have_dynamic() and have_readelf() and have_ldd(), skip),
    
    2
    +    unless(opsys('linux') and have_dynamic() and have_readelf() and have_ldd(), skip),
    
    3 3
         windows_skip,
    
    4 4
         extra_files([
    
    5 5
             'dumpDeclaredSymbols.c',
    

  • testsuite/tests/rts/symbols/dumpDeclaredSymbols.c
    ... ... @@ -19,8 +19,16 @@ void dumpDeclaredSymbols(void) {
    19 19
                 type = "data";
    
    20 20
             }
    
    21 21
     
    
    22
    +        const char * lbl = NULL;
    
    23
    +        if (sym->lbl_redirect_target) {
    
    24
    +            // In the case of redirects, the true symbol name is lbl_redirect_target
    
    25
    +            lbl = sym->lbl_redirect_target;
    
    26
    +        } else {
    
    27
    +            lbl = sym->lbl;
    
    28
    +        }
    
    29
    +
    
    22 30
             if (type) {
    
    23
    -            printf("%s %s\n", sym->lbl, type);
    
    31
    +            printf("%s %s\n", lbl, type);
    
    24 32
             }
    
    25 33
         }
    
    26 34
     }

  • testsuite/tests/rts/symbols/rts-check-symbols.ignore
    1
    +__ashldi3
    
    2
    +__ashrdi3
    
    3
    +__divdi3
    
    4
    +__fixunsdfdi
    
    5
    +__lshrdi3
    
    6
    +__moddi3
    
    7
    +__muldi3
    
    8
    +__udivdi3
    
    9
    +__udivti3
    
    10
    +__umoddi3
    
    11
    +__umodti3
    
    12
    +_fini
    
    13
    +_init
    
    1 14
     complex_ccall_adjustor_template
    
    2 15
     decodeAddendAarch64
    
    3 16
     encodeAddendAarch64
    
    ... ... @@ -30,11 +43,13 @@ isLoadStore
    30 43
     isVectorOp
    
    31 44
     makeStub
    
    32 45
     makeStubAarch64
    
    33
    -needStubForRelAarch64
    
    46
    +mblock_address_space
    
    47
    +mblock_map
    
    34 48
     needStubForRelaAarch64
    
    49
    +needStubForRelAarch64
    
    35 50
     numberOfStubsForSection
    
    36 51
     relocateObjectCode
    
    37 52
     relocateObjectCodeAarch64
    
    38 53
     simple_ccall_adjustor_template
    
    39 54
     StgReturn
    
    40
    -stubSizeAarch64
    55
    +stubSizeAarch64
    \ No newline at end of file

  • testsuite/tests/rts/symbols/rts-check-symbols.stdout
    1 1
     Symbols declared in RtsSymbols.c but not observed in the DSO:
    
    2
    -Declared> __udivti3 Code
    
    3
    -Declared> __umodti3 Code
    
    4 2
     Declared> atomic_dec Code
    
    5 3
     Declared> dirty_TVAR Code
    
    6 4
     Declared> ffi_call Code
    
    ... ... @@ -172,7 +170,6 @@ Observed> lookupIPEId Code
    172 170
     Observed> m32_free_page_pool Data
    
    173 171
     Observed> m32_free_page_pool_size Data
    
    174 172
     Observed> makeGot Code
    
    175
    -Observed> mblock_address_space Data
    
    176 173
     Observed> mblocks_allocated Data
    
    177 174
     Observed> modules Data
    
    178 175
     Observed> mpc_misses Data