wip
This commit is contained in:
parent
9c1a8ea219
commit
3ea4f28354
|
@ -1744,8 +1744,8 @@ string freeRtosTests[] = {
|
||||||
"AltQTest", "AltBlock", "AltPollQ", "blocktim", "countsem", "dead", "EventGroupsDemo", "flop", "integer", "QPeek",
|
"AltQTest", "AltBlock", "AltPollQ", "blocktim", "countsem", "dead", "EventGroupsDemo", "flop", "integer", "QPeek",
|
||||||
"QueueSet", "recmutex", "semtest", "TaskNotify", "BlockQ", "crhook", "dynamic",
|
"QueueSet", "recmutex", "semtest", "TaskNotify", "BlockQ", "crhook", "dynamic",
|
||||||
"GenQTest", "PollQ", "QueueOverwrite", "QueueSetPolling", "sp_flop", "test1"
|
"GenQTest", "PollQ", "QueueOverwrite", "QueueSetPolling", "sp_flop", "test1"
|
||||||
//"sp_flop"
|
// "flop"
|
||||||
//"flop", "sp_flop" // <- Simple test
|
// "flop", "sp_flop" // <- Simple test
|
||||||
// "AltBlckQ" ???
|
// "AltBlckQ" ???
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1924,20 +1924,22 @@ int main(int argc, char **argv, char **env) {
|
||||||
//redo(1,Workspace("freeRTOS_demo").loadHex("../../resources/hex/freeRTOS_demo.hex")->bootAt(0x80000000u)->run(100e6);)
|
//redo(1,Workspace("freeRTOS_demo").loadHex("../../resources/hex/freeRTOS_demo.hex")->bootAt(0x80000000u)->run(100e6);)
|
||||||
vector <std::function<void()>> tasks;
|
vector <std::function<void()>> tasks;
|
||||||
|
|
||||||
for(const string &name : freeRtosTests){
|
/*for(int redo = 0;redo < 4;redo++)*/{
|
||||||
tasks.push_back([=]() { Workspace(name + "_rv32i_O0").loadHex("../../resources/freertos/" + name + "_rv32i_O0.hex")->bootAt(0x80000000u)->run(4e6*15);});
|
for(const string &name : freeRtosTests){
|
||||||
tasks.push_back([=]() { Workspace(name + "_rv32i_O3").loadHex("../../resources/freertos/" + name + "_rv32i_O3.hex")->bootAt(0x80000000u)->run(4e6*15);});
|
tasks.push_back([=]() { Workspace(name + "_rv32i_O0").loadHex("../../resources/freertos/" + name + "_rv32i_O0.hex")->bootAt(0x80000000u)->run(4e6*15);});
|
||||||
#ifdef COMPRESSED
|
tasks.push_back([=]() { Workspace(name + "_rv32i_O3").loadHex("../../resources/freertos/" + name + "_rv32i_O3.hex")->bootAt(0x80000000u)->run(4e6*15);});
|
||||||
tasks.push_back([=]() { Workspace(name + "_rv32ic_O0").loadHex("../../resources/freertos/" + name + "_rv32ic_O0.hex")->bootAt(0x80000000u)->run(4e6*15);});
|
|
||||||
tasks.push_back([=]() { Workspace(name + "_rv32ic_O3").loadHex("../../resources/freertos/" + name + "_rv32ic_O3.hex")->bootAt(0x80000000u)->run(4e6*15);});
|
|
||||||
#endif
|
|
||||||
#if defined(MUL) && defined(DIV)
|
|
||||||
#ifdef COMPRESSED
|
#ifdef COMPRESSED
|
||||||
tasks.push_back([=]() { Workspace(name + "_rv32imac_O3").loadHex("../../resources/freertos/" + name + "_rv32imac_O3.hex")->bootAt(0x80000000u)->run(4e6*15);});
|
tasks.push_back([=]() { Workspace(name + "_rv32ic_O0").loadHex("../../resources/freertos/" + name + "_rv32ic_O0.hex")->bootAt(0x80000000u)->run(4e6*15);});
|
||||||
#else
|
tasks.push_back([=]() { Workspace(name + "_rv32ic_O3").loadHex("../../resources/freertos/" + name + "_rv32ic_O3.hex")->bootAt(0x80000000u)->run(4e6*15);});
|
||||||
tasks.push_back([=]() { Workspace(name + "_rv32im_O3").loadHex("../../resources/freertos/" + name + "_rv32im_O3.hex")->bootAt(0x80000000u)->run(4e6*15);});
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#if defined(MUL) && defined(DIV)
|
||||||
|
#ifdef COMPRESSED
|
||||||
|
tasks.push_back([=]() { Workspace(name + "_rv32imac_O3").loadHex("../../resources/freertos/" + name + "_rv32imac_O3.hex")->bootAt(0x80000000u)->run(4e6*15);});
|
||||||
|
#else
|
||||||
|
tasks.push_back([=]() { Workspace(name + "_rv32im_O3").loadHex("../../resources/freertos/" + name + "_rv32im_O3.hex")->bootAt(0x80000000u)->run(4e6*15);});
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
while(tasks.size() > FREERTOS_COUNT){
|
while(tasks.size() > FREERTOS_COUNT){
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
#!/usr/bin/env python
|
||||||
|
|
||||||
|
from os import system
|
||||||
|
from sys import argv
|
||||||
|
|
||||||
|
def remote(cmd):
|
||||||
|
cmd = "gcloud compute ssh miaou -- '" + cmd + "'"
|
||||||
|
print(cmd)
|
||||||
|
system(cmd)
|
||||||
|
|
||||||
|
def localToRemote(source, target):
|
||||||
|
remote("rm -rf target")
|
||||||
|
cmd = "gcloud compute scp " + source + " miaou:" + target
|
||||||
|
print(cmd)
|
||||||
|
system(cmd)
|
||||||
|
|
||||||
|
system("gcloud compute instances create miaou --machine-type=f1-micro")
|
||||||
|
system("rm -rf archive.tar.gz; git ls-files -z | xargs -0 tar -czf archive.tar.gz")
|
||||||
|
localToRemote("archive.tar.gz", "")
|
||||||
|
remote("tar -xzf archive.tar.gz")
|
||||||
|
remote("mkdir z;cd z; pwd")
|
||||||
|
remote("pwd")
|
||||||
|
|
|
@ -1898,8 +1898,8 @@
|
||||||
:10768000032505008328C100E398A8FC0325C10059
|
:10768000032505008328C100E398A8FC0325C10059
|
||||||
:107690001303050093030000131703009306000073
|
:107690001303050093030000131703009306000073
|
||||||
:1076A000032581009305050013060000B3E7B6002B
|
:1076A000032581009305050013060000B3E7B6002B
|
||||||
:1076B0003368C700370710F0130587F4B7150000CB
|
:1076B0003368C700370710F0130587F4B7250000BB
|
||||||
:1076C000938505FA13060000B386B7009388060079
|
:1076C000938505F413060000B386B700938806007F
|
||||||
:1076D000B3B8F8003307C800B387E8001387070082
|
:1076D000B3B8F8003307C800B387E8001387070082
|
||||||
:1076E00093870600130807002320F50023220501D5
|
:1076E00093870600130807002320F50023220501D5
|
||||||
:1076F000130000001301010167800000130101FF66
|
:1076F000130000001301010167800000130101FF66
|
||||||
|
@ -1922,7 +1922,7 @@
|
||||||
:1078000093E727002326F1008327C1001385070093
|
:1078000093E727002326F1008327C1001385070093
|
||||||
:107810008320C1011301010267800000130101FEF2
|
:107810008320C1011301010267800000130101FEF2
|
||||||
:10782000232E110023260100EFF0DFF817070000D8
|
:10782000232E110023260100EFF0DFF817070000D8
|
||||||
:107830001307870693060000130610009305400601
|
:107830001307870693060000130610009305200324
|
||||||
:10784000179501001305C59BEFD09FB92326A10012
|
:10784000179501001305C59BEFD09FB92326A10012
|
||||||
:107850008327C10063820702EFB05F9F9307050093
|
:107850008327C10063820702EFB05F9F9307050093
|
||||||
:10786000130700009306000013860700930510001D
|
:10786000130700009306000013860700930510001D
|
||||||
|
|
|
@ -1831,10 +1831,10 @@
|
||||||
:107250008327C100238007000325C1008320C102CA
|
:107250008327C100238007000325C1008320C102CA
|
||||||
:107260003305854003248102130101056780000076
|
:107260003305854003248102130101056780000076
|
||||||
:10727000B70710F083A647F403A607F403A747F463
|
:10727000B70710F083A647F403A607F403A747F463
|
||||||
:10728000E31AD7FEB7160000938606FAB306D600B7
|
:10728000E31AD7FEB7260000938606F4B306D600AD
|
||||||
:1072900033B6C600B305E60023A4D7F423A6B7F49B
|
:1072900033B6C600B305E60023A4D7F423A6B7F49B
|
||||||
:1072A00067800000B70710F003A747F403A607F4B0
|
:1072A00067800000B70710F003A747F403A607F4B0
|
||||||
:1072B00083A647F4E31AD7FEB7160000938606FAB2
|
:1072B00083A647F4E31AD7FEB7260000938606F4A8
|
||||||
:1072C000B306D60033B6C60023A4D7F4B305E60050
|
:1072C000B306D60033B6C60023A4D7F4B305E60050
|
||||||
:1072D00023A6B7F49307000873A047306780000027
|
:1072D00023A6B7F49307000873A047306780000027
|
||||||
:1072E000130101FF23248100232611009797010039
|
:1072E000130101FF23248100232611009797010039
|
||||||
|
@ -2292,7 +2292,7 @@
|
||||||
:108F2000832A41001301010267800000130101FF41
|
:108F2000832A41001301010267800000130101FF41
|
||||||
:108F3000130500002326110023248100EFE0DFB891
|
:108F3000130500002326110023248100EFE0DFB891
|
||||||
:108F400017E7FFFF1307073A930600001306100008
|
:108F400017E7FFFF1307073A930600001306100008
|
||||||
:108F500093054006177501001305854AEFC00FF809
|
:108F500093052003177501001305854AEFC00FF82C
|
||||||
:108F60006302050213040500EF905FFA1306050083
|
:108F60006302050213040500EF905FFA1306050083
|
||||||
:108F7000130700009306000093051000130504007A
|
:108F7000130700009306000093051000130504007A
|
||||||
:108F8000EFC0DF87EF905FC48320C100032481001E
|
:108F8000EFC0DF87EF905FC48320C100032481001E
|
||||||
|
|
|
@ -1181,7 +1181,7 @@
|
||||||
:1049B000130505F408412AC4370510F0130545F422
|
:1049B000130505F408412AC4370510F0130545F422
|
||||||
:1049C0000841B248E39EA8FC32452A83814313176D
|
:1049C0000841B248E39EA8FC32452A83814313176D
|
||||||
:1049D000030081462245AA850146B3E7B600336845
|
:1049D000030081462245AA850146B3E7B600336845
|
||||||
:1049E000C700370710F0130587F48565938505FA2E
|
:1049E000C700370710F0130587F48965938505F430
|
||||||
:1049F0000146B386B700B688B3B8F8003307C800DD
|
:1049F0000146B386B700B688B3B8F8003307C800DD
|
||||||
:104A0000B387E8003E87B6873A881CC12322050198
|
:104A0000B387E8003E87B6873A881CC12322050198
|
||||||
:104A1000010041018280411106C651379307000809
|
:104A1000010041018280411106C651379307000809
|
||||||
|
@ -1197,7 +1197,7 @@
|
||||||
:104AB000010013052573EFF0FFDDB24793E72700F0
|
:104AB000010013052573EFF0FFDDB24793E72700F0
|
||||||
:104AC0003EC6B2473E85F24005618280011106CEA6
|
:104AC0003EC6B2473E85F24005618280011106CEA6
|
||||||
:104AD00002C66D3F170700001307670481460546AD
|
:104AD00002C66D3F170700001307670481460546AD
|
||||||
:104AE0009305400617B5010013058571EFE07F9C23
|
:104AE0009305200317B5010013058571EFE07F9C46
|
||||||
:104AF0002AC6B24799CBEFD0AFC6AA8701478146F5
|
:104AF0002AC6B24799CBEFD0AFC6AA8701478146F5
|
||||||
:104B00003E8685453245EFE0FFA002C4EFD0EFA41A
|
:104B00003E8685453245EFE0FFA002C4EFD0EFA41A
|
||||||
:104B100081473E85F24005618280797106D62AC6BA
|
:104B100081473E85F24005618280797106D62AC6BA
|
||||||
|
|
|
@ -1277,10 +1277,10 @@
|
||||||
:104FB000C2C4C6C61ACEEFF04FD4B2472380070052
|
:104FB000C2C4C6C61ACEEFF04FD4B2472380070052
|
||||||
:104FC0003245B250018D225461618280B70710F0E2
|
:104FC0003245B250018D225461618280B70710F0E2
|
||||||
:104FD00083A647F403A607F403A747F4E31AD7FE12
|
:104FD00083A647F403A607F403A747F4E31AD7FE12
|
||||||
:104FE0008566938606FAB29633B6C600B305E60028
|
:104FE0008966938606F4B29633B6C600B305E6002A
|
||||||
:104FF00023A4D7F423A6B7F48280B70710F003A741
|
:104FF00023A4D7F423A6B7F48280B70710F003A741
|
||||||
:1050000047F403A607F483A647F4E31AD7FE8566A0
|
:1050000047F403A607F483A647F4E31AD7FE89669C
|
||||||
:10501000938606FAB29633B6C60023A4D7F4B30536
|
:10501000938606F4B29633B6C60023A4D7F4B3053C
|
||||||
:10502000E60023A6B7F49307000873A047308280F8
|
:10502000E60023A6B7F49307000873A047308280F8
|
||||||
:10503000411122C406C697B701009387275817B4B9
|
:10503000411122C406C697B701009387275817B4B9
|
||||||
:1050400001001304645798431C401306F07C930638
|
:1050400001001304645798431C401306F07C930638
|
||||||
|
@ -1688,7 +1688,7 @@
|
||||||
:10696000FF850840F2406244D2444249B249224A7B
|
:10696000FF850840F2406244D2444249B249224A7B
|
||||||
:10697000924A056182804111014506C622C4EFE0BA
|
:10697000924A056182804111014506C622C4EFE0BA
|
||||||
:106980009FC617E7FFFF1307E76A81460546930591
|
:106980009FC617E7FFFF1307E76A81460546930591
|
||||||
:10699000400617A501001305A5A6EFD08FA019C9C1
|
:10699000200317A501001305A5A6EFD08FA019C9E4
|
||||||
:1069A0002A84EFB0AFDD2A860147814685452285DE
|
:1069A0002A84EFB0AFDD2A860147814685452285DE
|
||||||
:1069B000EFD0CFABEFB00FB6B2402244014541015A
|
:1069B000EFD0CFABEFB00FB6B2402244014541015A
|
||||||
:0269C0008280D3
|
:0269C0008280D3
|
||||||
|
|
|
@ -1829,10 +1829,10 @@
|
||||||
:10723000238007000325C1008320C1023305854058
|
:10723000238007000325C1008320C1023305854058
|
||||||
:10724000032481021301010567800000B70710F0D5
|
:10724000032481021301010567800000B70710F0D5
|
||||||
:1072500083A647F403A607F403A747F4E31AD7FE6F
|
:1072500083A647F403A607F403A747F4E31AD7FE6F
|
||||||
:10726000B7160000938606FAB306D60033B6C600FA
|
:10726000B7260000938606F4B306D60033B6C600F0
|
||||||
:10727000B305E60023A4D7F423A6B7F46780000083
|
:10727000B305E60023A4D7F423A6B7F46780000083
|
||||||
:10728000B70710F003A747F403A607F483A647F453
|
:10728000B70710F003A747F403A607F483A647F453
|
||||||
:10729000E31AD7FEB7160000938606FAB306D600A7
|
:10729000E31AD7FEB7260000938606F4B306D6009D
|
||||||
:1072A00033B6C60023A4D7F4B305E60023A6B7F48B
|
:1072A00033B6C60023A4D7F4B305E60023A6B7F48B
|
||||||
:1072B0009307000873A0473067800000130101FFA7
|
:1072B0009307000873A0473067800000130101FFA7
|
||||||
:1072C00023248100232611009797010093874723E9
|
:1072C00023248100232611009797010093874723E9
|
||||||
|
@ -2218,7 +2218,7 @@
|
||||||
:108A8000032901018329C100032A8100832A4100AF
|
:108A8000032901018329C100032A8100832A4100AF
|
||||||
:108A90001301010267800000130101FF13050000AC
|
:108A90001301010267800000130101FF13050000AC
|
||||||
:108AA0002326110023248100EFE0DFFF17F7FFFFEB
|
:108AA0002326110023248100EFE0DFFF17F7FFFFEB
|
||||||
:108AB0001307078193060000130610009305400674
|
:108AB0001307078193060000130610009305200397
|
||||||
:108AC000178501001305C593EFC01FBF63020502A0
|
:108AC000178501001305C593EFC01FBF63020502A0
|
||||||
:108AD00013040500EFA04FC21306050013070000A2
|
:108AD00013040500EFA04FC21306050013070000A2
|
||||||
:108AE000930600009305100013050400EFC0DFCECD
|
:108AE000930600009305100013050400EFC0DFCECD
|
||||||
|
|
|
@ -1275,10 +1275,10 @@
|
||||||
:104F9000BEC236DEBAC0C2C4C6C61ACEEFF04FD407
|
:104F9000BEC236DEBAC0C2C4C6C61ACEEFF04FD407
|
||||||
:104FA000B247238007003245B250018D225461611F
|
:104FA000B247238007003245B250018D225461611F
|
||||||
:104FB0008280B70710F083A647F403A607F403A77F
|
:104FB0008280B70710F083A647F403A607F403A77F
|
||||||
:104FC00047F4E31AD7FE8566938606FAB29633B69F
|
:104FC00047F4E31AD7FE8966938606F4B29633B6A1
|
||||||
:104FD000C600B305E60023A4D7F423A6B7F4828065
|
:104FD000C600B305E60023A4D7F423A6B7F4828065
|
||||||
:104FE000B70710F003A747F403A607F483A647F416
|
:104FE000B70710F003A747F403A607F483A647F416
|
||||||
:104FF000E31AD7FE8566938606FAB29633B6C600E4
|
:104FF000E31AD7FE8966938606F4B29633B6C600E6
|
||||||
:1050000023A4D7F4B305E60023A6B7F4930700085A
|
:1050000023A4D7F4B305E60023A6B7F4930700085A
|
||||||
:1050100073A047308280411122C406C697B70100B1
|
:1050100073A047308280411122C406C697B70100B1
|
||||||
:105020009387074E17B401001304444D98431C4066
|
:105020009387074E17B401001304444D98431C4066
|
||||||
|
@ -1576,7 +1576,7 @@
|
||||||
:1062600093C4F4FFF98C04C0EFB03FF40840F2404F
|
:1062600093C4F4FFF98C04C0EFB03FF40840F2404F
|
||||||
:106270006244D2444249B249224A924A056182802C
|
:106270006244D2444249B249224A924A056182802C
|
||||||
:106280004111014506C622C4EFF04FB417F7FFFFD6
|
:106280004111014506C622C4EFF04FB417F7FFFFD6
|
||||||
:106290001307A7D8814605469305400617A50100B8
|
:106290001307A7D8814605469305200317A50100DB
|
||||||
:1062A00013050516EFD05F8E19C92A84EFB0FFCB16
|
:1062A00013050516EFD05F8E19C92A84EFB0FFCB16
|
||||||
:1062B0002A860147814685452285EFD09F99EFB018
|
:1062B0002A860147814685452285EFD09F99EFB018
|
||||||
:0C62C0005FA4B2402244014541018280ED
|
:0C62C0005FA4B2402244014541018280ED
|
||||||
|
|
|
@ -1844,7 +1844,7 @@
|
||||||
:107320008328C100E398A8FC0325C10013030500CE
|
:107320008328C100E398A8FC0325C10013030500CE
|
||||||
:107330009303000013170300930600000325810048
|
:107330009303000013170300930600000325810048
|
||||||
:107340009305050013060000B3E7B6003368C700D5
|
:107340009305050013060000B3E7B6003368C700D5
|
||||||
:10735000370710F0130587F4B7150000938505FA79
|
:10735000370710F0130587F4B7250000938505F46F
|
||||||
:1073600013060000B386B70093880600B3B8F80090
|
:1073600013060000B386B70093880600B3B8F80090
|
||||||
:107370003307C800B387E800138707009387060028
|
:107370003307C800B387E800138707009387060028
|
||||||
:10738000130807002320F500232205011300000045
|
:10738000130807002320F500232205011300000045
|
||||||
|
@ -1868,7 +1868,7 @@
|
||||||
:1074A0002326F1008327C100138507008320C10133
|
:1074A0002326F1008327C100138507008320C10133
|
||||||
:1074B0001301010267800000130101FE232E110059
|
:1074B0001301010267800000130101FE232E110059
|
||||||
:1074C00023260100EFF0DFF81707000013078706F7
|
:1074C00023260100EFF0DFF81707000013078706F7
|
||||||
:1074D000930600001306100093054006179501005F
|
:1074D0009306000013061000930520031795010082
|
||||||
:1074E000130505D2EFD09FB92326A1008327C10041
|
:1074E000130505D2EFD09FB92326A1008327C10041
|
||||||
:1074F00063820702EFB05F9F930705001307000048
|
:1074F00063820702EFB05F9F930705001307000048
|
||||||
:107500009306000013860700930510000325C100B1
|
:107500009306000013860700930510000325C100B1
|
||||||
|
|
|
@ -1772,11 +1772,11 @@
|
||||||
:106EA000EFF04F9B8327C100238007000325C1001B
|
:106EA000EFF04F9B8327C100238007000325C1001B
|
||||||
:106EB0008320C102330585400324810213010105AB
|
:106EB0008320C102330585400324810213010105AB
|
||||||
:106EC00067800000B70710F083A647F403A607F415
|
:106EC00067800000B70710F083A647F403A607F415
|
||||||
:106ED00003A747F4E31AD7FEB7160000938606FA15
|
:106ED00003A747F4E31AD7FEB7260000938606F40B
|
||||||
:106EE000B306D60033B6C600B305E60023A4D7F434
|
:106EE000B306D60033B6C600B305E60023A4D7F434
|
||||||
:106EF00023A6B7F467800000B70710F003A747F494
|
:106EF00023A6B7F467800000B70710F003A747F494
|
||||||
:106F000003A607F483A647F4E31AD7FEB7160000DA
|
:106F000003A607F483A647F4E31AD7FEB7260000CA
|
||||||
:106F1000938606FAB306D60033B6C60023A4D7F488
|
:106F1000938606F4B306D60033B6C60023A4D7F48E
|
||||||
:106F2000B305E60023A6B7F49307000873A0473023
|
:106F2000B305E60023A6B7F49307000873A0473023
|
||||||
:106F300067800000130101FF232481002326110034
|
:106F300067800000130101FF232481002326110034
|
||||||
:106F40009797010093878767179401001304C4661D
|
:106F40009797010093878767179401001304C4661D
|
||||||
|
@ -2260,7 +2260,7 @@
|
||||||
:108D2000032901018329C100032A8100832A41000C
|
:108D2000032901018329C100032A8100832A41000C
|
||||||
:108D30001301010267800000130101FF1305000009
|
:108D30001301010267800000130101FF1305000009
|
||||||
:108D40002326110023248100EFE0DFBA17E7FFFF9D
|
:108D40002326110023248100EFE0DFBA17E7FFFF9D
|
||||||
:108D50001307871E930600001306100093054006B4
|
:108D50001307871E930600001306100093052003D7
|
||||||
:108D6000177501001305C569EFC08FDC63020502AA
|
:108D6000177501001305C569EFC08FDC63020502AA
|
||||||
:108D700013040500EF90DFDE130605001307000063
|
:108D700013040500EF90DFDE130605001307000063
|
||||||
:108D8000930600009305100013050400EFC04FEC9C
|
:108D8000930600009305100013050400EFC04FEC9C
|
||||||
|
|
|
@ -1148,7 +1148,7 @@
|
||||||
:1047A000370510F0130545F40841B248E39EA8FC14
|
:1047A000370510F0130545F40841B248E39EA8FC14
|
||||||
:1047B00032452A8381431317030081462245AA8587
|
:1047B00032452A8381431317030081462245AA8587
|
||||||
:1047C0000146B3E7B6003368C700370710F013059A
|
:1047C0000146B3E7B6003368C700370710F013059A
|
||||||
:1047D00087F48565938505FA0146B386B700B688E8
|
:1047D00087F48965938505F40146B386B700B688EA
|
||||||
:1047E000B3B8F8003307C800B387E8003E87B68740
|
:1047E000B3B8F8003307C800B387E8003E87B68740
|
||||||
:1047F0003A881CC123220501010041018280411138
|
:1047F0003A881CC123220501010041018280411138
|
||||||
:1048000006C651379307000873A047300100B24035
|
:1048000006C651379307000873A047300100B24035
|
||||||
|
@ -1163,7 +1163,7 @@
|
||||||
:104890008547630CF70017C501001305A594EFF0D9
|
:104890008547630CF70017C501001305A594EFF0D9
|
||||||
:1048A000FFDDB24793E727003EC6B2473E85F240A0
|
:1048A000FFDDB24793E727003EC6B2473E85F240A0
|
||||||
:1048B00005618280011106CE02C66D3F1707000018
|
:1048B00005618280011106CE02C66D3F1707000018
|
||||||
:1048C00013076704814605469305400617C5010096
|
:1048C00013076704814605469305200317C50100B9
|
||||||
:1048D00013050593EFE07F9C2AC6B24799CBEFD032
|
:1048D00013050593EFE07F9C2AC6B24799CBEFD032
|
||||||
:1048E000AFC6AA87014781463E8685453245EFE03F
|
:1048E000AFC6AA87014781463E8685453245EFE03F
|
||||||
:1048F000FFA002C4EFD0EFA481473E85F2400561DE
|
:1048F000FFA002C4EFD0EFA481473E85F2400561DE
|
||||||
|
|
|
@ -1239,10 +1239,10 @@
|
||||||
:104D5000BAC0C2C4C6C61ACEEFF04FD4B247238041
|
:104D5000BAC0C2C4C6C61ACEEFF04FD4B247238041
|
||||||
:104D600007003245B250018D225461618280B7073D
|
:104D600007003245B250018D225461618280B7073D
|
||||||
:104D700010F083A647F403A607F403A747F4E31A49
|
:104D700010F083A647F403A607F403A747F4E31A49
|
||||||
:104D8000D7FE8566938606FAB29633B6C600B3059B
|
:104D8000D7FE8966938606F4B29633B6C600B3059D
|
||||||
:104D9000E60023A4D7F423A6B7F48280B70710F067
|
:104D9000E60023A4D7F423A6B7F48280B70710F067
|
||||||
:104DA00003A747F403A607F483A647F4E31AD7FE44
|
:104DA00003A747F403A607F483A647F4E31AD7FE44
|
||||||
:104DB0008566938606FAB29633B6C60023A4D7F466
|
:104DB0008966938606F4B29633B6C60023A4D7F468
|
||||||
:104DC000B305E60023A6B7F49307000873A04730A5
|
:104DC000B305E60023A6B7F49307000873A04730A5
|
||||||
:104DD0008280411122C406C697B701009387077EDF
|
:104DD0008280411122C406C697B701009387077EDF
|
||||||
:104DE00017B401001304447D98431C401306F07C63
|
:104DE00017B401001304447D98431C401306F07C63
|
||||||
|
@ -1671,7 +1671,7 @@
|
||||||
:10685000E1B793C4F4FFF98C04C0EFB04FF00840E7
|
:10685000E1B793C4F4FFF98C04C0EFB04FF00840E7
|
||||||
:10686000F2406244D2444249B249224A924A056106
|
:10686000F2406244D2444249B249224A924A056106
|
||||||
:1068700082804111014506C622C4EFE01FC817E718
|
:1068700082804111014506C622C4EFE01FC817E718
|
||||||
:10688000FFFF13074755814605469305400617A5A8
|
:10688000FFFF13074755814605469305200317A5CB
|
||||||
:1068900001001305E5B6EFD0EF8A19C92A84EFB0DD
|
:1068900001001305E5B6EFD0EF8A19C92A84EFB0DD
|
||||||
:1068A0000FC82A860147814685452285EFD02F965D
|
:1068A0000FC82A860147814685452285EFD02F965D
|
||||||
:0E68B000EFB06FA0B24022440145410182804A
|
:0E68B000EFB06FA0B24022440145410182804A
|
||||||
|
|
|
@ -1770,10 +1770,10 @@
|
||||||
:106E80008327C100238007000325C1008320C1029E
|
:106E80008327C100238007000325C1008320C1029E
|
||||||
:106E9000330585400324810213010105678000004A
|
:106E9000330585400324810213010105678000004A
|
||||||
:106EA000B70710F083A647F403A607F403A747F437
|
:106EA000B70710F083A647F403A607F403A747F437
|
||||||
:106EB000E31AD7FEB7160000938606FAB306D6008B
|
:106EB000E31AD7FEB7260000938606F4B306D60081
|
||||||
:106EC00033B6C600B305E60023A4D7F423A6B7F46F
|
:106EC00033B6C600B305E60023A4D7F423A6B7F46F
|
||||||
:106ED00067800000B70710F003A747F403A607F484
|
:106ED00067800000B70710F003A747F403A607F484
|
||||||
:106EE00083A647F4E31AD7FEB7160000938606FA86
|
:106EE00083A647F4E31AD7FEB7260000938606F47C
|
||||||
:106EF000B306D60033B6C60023A4D7F4B305E60024
|
:106EF000B306D60033B6C60023A4D7F4B305E60024
|
||||||
:106F000023A6B7F49307000873A0473067800000FA
|
:106F000023A6B7F49307000873A0473067800000FA
|
||||||
:106F1000130101FF2324810023261100979701000C
|
:106F1000130101FF2324810023261100979701000C
|
||||||
|
@ -2187,7 +2187,7 @@
|
||||||
:108890008329C100032A8100832A410013010102B8
|
:108890008329C100032A8100832A410013010102B8
|
||||||
:1088A00067800000130101FF13050000232611005B
|
:1088A00067800000130101FF13050000232611005B
|
||||||
:1088B00023248100EFF0CF8117E7FFFF13078765BF
|
:1088B00023248100EFF0CF8117E7FFFF13078765BF
|
||||||
:1088C000930600001306100093054006178501006B
|
:1088C000930600001306100093052003178501008E
|
||||||
:1088D000130505B3EFC09FA363020502130405004F
|
:1088D000130505B3EFC09FA363020502130405004F
|
||||||
:1088E000EFA0CFA6130605001307000093060000B3
|
:1088E000EFA0CFA6130605001307000093060000B3
|
||||||
:1088F0009305100013050400EFC05FB3EF90DFF0A5
|
:1088F0009305100013050400EFC05FB3EF90DFF0A5
|
||||||
|
|
|
@ -1237,10 +1237,10 @@
|
||||||
:104D300006D6BEC236DEBAC0C2C4C6C61ACEEFF0B0
|
:104D300006D6BEC236DEBAC0C2C4C6C61ACEEFF0B0
|
||||||
:104D40004FD4B247238007003245B250018D225420
|
:104D40004FD4B247238007003245B250018D225420
|
||||||
:104D500061618280B70710F083A647F403A607F4C9
|
:104D500061618280B70710F083A647F403A607F4C9
|
||||||
:104D600003A747F4E31AD7FE8566938606FAB29640
|
:104D600003A747F4E31AD7FE8966938606F4B29642
|
||||||
:104D700033B6C600B305E60023A4D7F423A6B7F4E0
|
:104D700033B6C600B305E60023A4D7F423A6B7F4E0
|
||||||
:104D80008280B70710F003A747F403A607F483A6B1
|
:104D80008280B70710F003A747F403A607F483A6B1
|
||||||
:104D900047F4E31AD7FE8566938606FAB29633B6D1
|
:104D900047F4E31AD7FE8966938606F4B29633B6D3
|
||||||
:104DA000C60023A4D7F4B305E60023A6B7F49307FF
|
:104DA000C60023A4D7F4B305E60023A6B7F49307FF
|
||||||
:104DB000000873A047308280411122C406C697B70D
|
:104DB000000873A047308280411122C406C697B70D
|
||||||
:104DC00001009387E77317B4010013042473984319
|
:104DC00001009387E77317B4010013042473984319
|
||||||
|
@ -1560,7 +1560,7 @@
|
||||||
:10616000FFDE0840F2406244D2444249B249224A2A
|
:10616000FFDE0840F2406244D2444249B249224A2A
|
||||||
:10617000924A056182804111014506C622C4EFF0B2
|
:10617000924A056182804111014506C622C4EFF0B2
|
||||||
:10618000CFB517F7FFFF130767C381460546930591
|
:10618000CFB517F7FFFF130767C381460546930591
|
||||||
:10619000400617A501001305A526EFD00FF919C970
|
:10619000200317A501001305A526EFD00FF919C993
|
||||||
:1061A0002A84EFB0BFB62A860147814685452285FD
|
:1061A0002A84EFB0BFB62A860147814685452285FD
|
||||||
:1061B000EFD05F84EFB01F8FB24022440145410110
|
:1061B000EFD05F84EFB01F8FB24022440145410110
|
||||||
:0261C0008280DB
|
:0261C0008280DB
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -12,7 +12,7 @@
|
||||||
:1000A000A57201461122170502001305A540970508
|
:1000A000A57201461122170502001305A540970508
|
||||||
:1000B00002009385A5400146C52817A50300130536
|
:1000B00002009385A5400146C52817A50300130536
|
||||||
:1000C000E57097B503009385257037B6ABAB130683
|
:1000C000E57097B503009385257037B6ABAB130683
|
||||||
:1000D000B6BAD92817B103001301416FEF40607D14
|
:1000D000B6BAD92817B103001301416FEF40807DF4
|
||||||
:1000E000860293D21200F512638802008242110147
|
:1000E000860293D21200F512638802008242110147
|
||||||
:1000F0006F00001073002030824211017300203025
|
:1000F0006F00001073002030824211017300203025
|
||||||
:10010000711116C0F3222034E3CC02FC82421101AB
|
:10010000711116C0F3222034E3CC02FC82421101AB
|
||||||
|
@ -49,7 +49,7 @@
|
||||||
:1002F000220523A4320523A6420523A8520523AADA
|
:1002F000220523A4320523A6420523A8520523AADA
|
||||||
:10030000620523AC720523AE820523A0920723A2C7
|
:10030000620523AC720523AE820523A0920723A2C7
|
||||||
:10031000A20723A4B20723A6C20723A8D20723AAB1
|
:10031000A20723A4B20723A6C20723A8D20723AAB1
|
||||||
:10032000E20723ACF207EF40604D17010200032102
|
:10032000E20723ACF207EF40804D170102000321E2
|
||||||
:1003300061180241F65273901234B7220000938282
|
:1003300061180241F65273901234B7220000938282
|
||||||
:10034000028873A0023082403242C2425243E243EA
|
:10034000028873A0023082403242C2425243E243EA
|
||||||
:10035000724482541255A2553256C2565257E25731
|
:10035000724482541255A2553256C2565257E25731
|
||||||
|
@ -526,7 +526,7 @@
|
||||||
:1020C000B247A1079C4322476318F700B247B10704
|
:1020C000B247A1079C4322476318F700B247B10704
|
||||||
:1020D0009C4322476308F70497E701009387873DF5
|
:1020D0009C4322476308F70497E701009387873DF5
|
||||||
:1020E000984397E701009387E73C9C439387470316
|
:1020E000984397E701009387E73C9C439387470316
|
||||||
:1020F000BE853A85EF20D00A35A097E70100938787
|
:1020F000BE853A85EF20F00A35A097E70100938767
|
||||||
:10210000E7559C4381E77370043001A097E7010015
|
:10210000E7559C4381E77370043001A097E7010015
|
||||||
:102110009387C7549C431387F7FF97E70100938782
|
:102110009387C7549C431387F7FF97E70100938782
|
||||||
:10212000E75398C397E7010093874753984397E68F
|
:10212000E75398C397E7010093874753984397E68F
|
||||||
|
@ -998,7 +998,7 @@
|
||||||
:103E4000DC436247E3E9E7FE82579843F24798C3B1
|
:103E4000DC436247E3E9E7FE82579843F24798C3B1
|
||||||
:103E50008257724798C397C701009387E7669843D4
|
:103E50008257724798C397C701009387E7669843D4
|
||||||
:103E6000B257DC431D8F97C701009387E76598C35E
|
:103E6000B257DC431D8F97C701009387E76598C35E
|
||||||
:103E7000EFD0DFD8925799E3EF00F03192573E85AB
|
:103E7000EFD0DFD8925799E3EF00103292573E858A
|
||||||
:103E8000F25021618280797106D62AC6B2473ECCB3
|
:103E8000F25021618280797106D62AC6B2473ECCB3
|
||||||
:103E9000B247BDC3A147B307F0406247BA973ECCD3
|
:103E9000B247BDC3A147B307F0406247BA973ECCD3
|
||||||
:103EA000E2473ECAEFD0DFD3D247DC433EC8976734
|
:103EA000E2473ECAEFD0DFD3D247DC433EC8976734
|
||||||
|
@ -1148,145 +1148,145 @@
|
||||||
:1047A000370510F0130545F40841B248E39EA8FC14
|
:1047A000370510F0130545F40841B248E39EA8FC14
|
||||||
:1047B00032452A8381431317030081462245AA8587
|
:1047B00032452A8381431317030081462245AA8587
|
||||||
:1047C0000146B3E7B6003368C700370710F013059A
|
:1047C0000146B3E7B6003368C700370710F013059A
|
||||||
:1047D00087F49305007D0146B386B700B688B3B869
|
:1047D00087F48565938505FA0146B386B700B688E8
|
||||||
:1047E000F8003307C800B387E8003E87B6873A88E9
|
:1047E000B3B8F8003307C800B387E8003E87B68740
|
||||||
:1047F0001CC123220501010041018280411106C62E
|
:1047F0003A881CC123220501010041018280411138
|
||||||
:1048000059379307000873A047300100B2404101B7
|
:1048000006C651379307000873A047300100B24035
|
||||||
:104810008280011106CE2AC617C501001305059B2B
|
:1048100041018280011106CE2AC617C50100130589
|
||||||
:10482000EFF0DFE50100F24005618280011106CE64
|
:10482000E59AEFF0BFE50100F240056182800111D9
|
||||||
:104830002AC617C501001305E599EFF03FE4010012
|
:1048300006CE2AC617C501001305C599EFF01FE47F
|
||||||
:10484000F24005618280797106D62AC602CE29A07F
|
:104840000100F24005618280797106D62AC602CE47
|
||||||
:104850000100F24785073ECE724785679387773818
|
:1048500029A00100F24785073ECE724785679387FE
|
||||||
:10486000E3D8E7FE17C5010013054597EFF01FE1F8
|
:104860007738E3D8E7FE17C5010013052597EFF069
|
||||||
:10487000F1BF411106C60145152A0100B2404101B0
|
:10487000FFE0F1BF411106C60145152A0100B24013
|
||||||
:104880008280011106CE02C6EF0060792A87854733
|
:1048800041018280011106CE02C6EF0060792A87BD
|
||||||
:10489000630CF70017C501001305C594EFF01FDE88
|
:104890008547630CF70017C501001305A594EFF0D9
|
||||||
:1048A000B24793E727003EC6B2473E85F240056116
|
:1048A000FFDDB24793E727003EC6B2473E85F240A0
|
||||||
:1048B0008280011106CE02C66D3F17070000130764
|
:1048B00005618280011106CE02C66D3F1707000018
|
||||||
:1048C0006704814605469305400617C50100130598
|
:1048C00013076704814605469305200317C50100B9
|
||||||
:1048D000E592EFE09F9C2AC6B24799CBEFD0CFC6B6
|
:1048D0001305C592EFE07F9C2AC6B24799CBEFD073
|
||||||
:1048E000AA87014781463E8685453245EFE01FA1F4
|
:1048E000AFC6AA87014781463E8685453245EFE03F
|
||||||
:1048F00002C4EFD00FA581473E85F240056182805A
|
:1048F000FFA002C4EFD0EFA481473E85F2400561DE
|
||||||
:10490000797106D62AC697C701009387E7BA9C43F8
|
:104900008280797106D62AC697C701009387C7BAF5
|
||||||
:104910001387470697C70100938707BA98C397C7BD
|
:104910009C431387470697C701009387E7B998C35D
|
||||||
:1049200001009387A7B99C431387470697C70100E7
|
:1049200097C70100938787B99C431387470697C7AA
|
||||||
:104930009387C7B898C397C701009387E7B7984391
|
:1049300001009387A7B898C397C701009387C7B7AB
|
||||||
:104940009307F07C63D3E70497C701009387C7B64A
|
:1049400098439307F07C63D3E70497C701009387EC
|
||||||
:104950009C431387078397C701009387E7B598C3E4
|
:10495000A7B69C431387078397C701009387C7B502
|
||||||
:104960000D372ACEF24799EB97C70100938707B519
|
:1049600098C30D372ACEF24799EB97C7010093877A
|
||||||
:10497000984385679387F77663DBE700F2473E85C8
|
:10497000E7B4984385679387F77663DBE700F247F0
|
||||||
:10498000EFF0BFCEEFD0CFA321A0010011A0010016
|
:104980003E85EFF09FCEEFD0AFA321A0010011A094
|
||||||
:10499000B250456182807370043001A001008280B2
|
:104990000100B250456182807370043001A00100B3
|
||||||
:1049A00041112AC62EC47370043001A0011106CE35
|
:1049A000828041112AC62EC47370043001A0011107
|
||||||
:1049B0002AC68148014881473247975603009386AB
|
:1049B00006CE2AC6814801488147324797560300F0
|
||||||
:1049C00066DC1306004097C5010093852584170512
|
:1049C000938646DC1306004097C501009385058455
|
||||||
:1049D00000001305C508EFC05F908148014881477A
|
:1049D000170500001305C508EFC03F908148014846
|
||||||
:1049E000324797560300938606DA1306004097C5B0
|
:1049E00081473247975603009386E6D91306004065
|
||||||
:1049F000010093852582170500001305451BEFC0B4
|
:1049F00097C5010093850582170500001305451B27
|
||||||
:104A0000DF8D8148014881473247975603009386DE
|
:104A0000EFC0BF8D81480148814732479756030068
|
||||||
:104A1000A6D71306004097C501009385258017058A
|
:104A1000938686D71306004097C5010093850580CD
|
||||||
:104A2000000013050533EFC05F8B814801488147C3
|
:104A20001705000013050533EFC03F8B814801488F
|
||||||
:104A3000324797560300938646D51306004097B534
|
:104A30008147324797560300938626D513060040D8
|
||||||
:104A400001009385257E1705000013050547EFC07B
|
:104A400097B501009385057E1705000013050547FE
|
||||||
:104A5000DF880100F240056182805D7186C6A2C4D4
|
:104A5000EFC0BF880100F240056182805D7186C6AB
|
||||||
:104A6000A6C2CAC02AC6231F010297B701009387B6
|
:104A6000A2C4A6C2CAC02AC6231F010297B701006A
|
||||||
:104A7000E77B03A847009C433EC842CAB2473EDCDE
|
:104A70009387C77B03A847009C433EC842CAB247FE
|
||||||
:104A800097B701009387077B03A847009C433ED854
|
:104A80003EDC97B701009387E77A03A847009C4371
|
||||||
:104A900042DA97B701009387677A03A847009C43DF
|
:104A90003ED842DA97B701009387477A03A84700C8
|
||||||
:104AA0003ED442D697B701009387C77903A8470041
|
:104AA0009C433ED442D697B701009387A77903A8C9
|
||||||
:104AB0009C433ED042D2C2575258A25632573686F5
|
:104AB00047009C433ED042D2C2575258A25632576A
|
||||||
:104AC000BA863E85C285EF10E00AAA872E883E8509
|
:104AC0003686BA863E85C285EF10C00AAA872E8830
|
||||||
:104AD000C285825712583E86C286EF20A02AAA8736
|
:104AD0003E85C285825712583E86C286EF20802AC4
|
||||||
:104AE0002E883ECC42CEE2477248C24652473686B6
|
:104AE000AA872E883ECC42CEE2477248C246524741
|
||||||
:104AF000BA863E85C285EF20F017AA872E88014628
|
:104AF0003686BA863E85C285EF20D017AA872E88D3
|
||||||
:104B000081463E85C285EF202018AA8763D5070419
|
:104B0000014681463E85C285EF200018AA8763D5FD
|
||||||
:104B1000E24772483E8437070080B344E800C2474A
|
:104B10000704E24772483E8437070080B344E80048
|
||||||
:104B200052483E86C2862285A685EF20B014AA8709
|
:104B2000C24752483E86C2862285A685EF20901451
|
||||||
:104B30002E883E85C285054997B701009387077186
|
:104B3000AA872E883E85C285054997B701009387CD
|
||||||
:104B40009043D443EF208004AA876343F0000149D7
|
:104B4000E7709043D443EF206004AA876343F000EA
|
||||||
:104B50009377F90F35A8E2477248C2465247368626
|
:104B500001499377F90F35A8E2477248C246524798
|
||||||
:104B6000BA863E85C285EF20F010AA872E883E8542
|
:104B60003686BA863E85C285EF20D010AA872E8869
|
||||||
:104B7000C285054997B701009387476D9043D44399
|
:104B70003E85C285054997B701009387276D90430D
|
||||||
:104B8000EF20C000AA876343F00001499377F90F33
|
:104B8000D443EF20A000AA876343F0000149937744
|
||||||
:104B900081C78547231FF1028317E103E39207EEE4
|
:104B9000F90F81C78547231FF1028317E103E392D1
|
||||||
:104BA000E25705472390E700E1BD5D7186C6A2C4C8
|
:104BA00007EEE25705472390E700E1BD5D7186C639
|
||||||
:104BB000A6C2CAC02AC6231F010297B70100938765
|
:104BB000A2C4A6C2CAC02AC6231F010297B7010019
|
||||||
:104BC000676903A847009C433ED842DA97B70100C3
|
:104BC0009387476903A847009C433ED842DA97B7CA
|
||||||
:104BD0009387C76803A847009C433ED442D697B743
|
:104BD00001009387A76803A847009C433ED442D6B0
|
||||||
:104BE00001009387276803A847009C433ED042D228
|
:104BE00097B701009387076803A847009C433ED00E
|
||||||
:104BF000C2575258A25632573686BA863E85C2856B
|
:104BF00042D2C2575258A25632573686BA863E859E
|
||||||
:104C0000EF10C077AA872E883E85C285825712583A
|
:104C0000C285EF10A077AA872E883E85C28582577D
|
||||||
:104C10003E86C286EF200017AA872E883EC842CA69
|
:104C100012583E86C286EF20E016AA872E883EC82C
|
||||||
:104C2000B2473EDC97B701009387C76203A84700ED
|
:104C200042CAB2473EDC97B701009387A76203A848
|
||||||
:104C30009C433ED842DA97B701009387276203A8C6
|
:104C300047009C433ED842DA97B70100938707624A
|
||||||
:104C400047009C433ED442D697B7010093878761C3
|
:104C400003A847009C433ED442D697B70100938700
|
||||||
:104C500003A847009C433ED042D2C2575258A256A6
|
:104C5000676103A847009C433ED042D2C2575258D6
|
||||||
:104C600032573686BA863E85C285EF102071AA87F4
|
:104C6000A25632573686BA863E85C285EF1000714D
|
||||||
:104C70002E883E85C285825712583E86C286EF2016
|
:104C7000AA872E883E85C285825712583E86C286F4
|
||||||
:104C80006010AA872E883ECC42CEE2477248C246C8
|
:104C8000EF204010AA872E883ECC42CEE2477248E1
|
||||||
:104C900052473686BA863E85C285EF20A07DAA8718
|
:104C9000C24652473686BA863E85C285EF20807D61
|
||||||
:104CA0002E88014681463E85C285EF10F07DAA8799
|
:104CA000AA872E88014681463E85C285EF10D07DB9
|
||||||
:104CB00063D50704E24772483E8437070080B34457
|
:104CB000AA8763D50704E24772483E84370700801D
|
||||||
:104CC000E800C24752483E86C2862285A685EF206C
|
:104CC000B344E800C24752483E86C2862285A68584
|
||||||
:104CD000607AAA872E883E85C285054997B701006C
|
:104CD000EF20407AAA872E883E85C285054997B77E
|
||||||
:104CE0009387C7569043D443EF10506AAA87634313
|
:104CE00001009387A7569043D443EF10306AAA87F8
|
||||||
:104CF000F00001499377F90F35A8E2477248C246A0
|
:104CF0006343F00001499377F90F35A8E247724802
|
||||||
:104D000052473686BA863E85C285EF20A076AA87AE
|
:104D0000C24652473686BA863E85C285EF208076F7
|
||||||
:104D10002E883E85C285054997B7010093870753C2
|
:104D1000AA872E883E85C285054997B701009387EB
|
||||||
:104D20009043D443EF109066AA876343F000014993
|
:104D2000E7529043D443EF107066AA876343F000C4
|
||||||
:104D30009377F90F81C78547231FF1028317E1039A
|
:104D300001499377F90F81C78547231FF102831734
|
||||||
:104D4000E39207EEE25705472390E700E1BD5D716E
|
:104D4000E103E39207EEE25705472390E700E1BD58
|
||||||
:104D500086C6A2C42AC6A9473EDA231D0102B2476D
|
:104D50005D7186C6A2C42AC6A9473EDA231D010298
|
||||||
:104D60003ED8D2578E073E85EFE0FFFE2AD602D00E
|
:104D6000B2473ED8D2578E073E85EFE0DFFE2AD607
|
||||||
:104D700002D202CC02CE02DE95A07255EF20507115
|
:104D700002D002D202CC02CE02DE95A07255EF2004
|
||||||
:104D8000F2578E0732573304F70097B70100938725
|
:104D80003071F2578E0732573304F70097B701009E
|
||||||
:104D9000E74D9043D443EF00F05DAA872E881CC0F6
|
:104D90009387C74D9043D443EF00D05DAA872E88F8
|
||||||
:104DA000232204017255EF20B06E97B7010093875C
|
:104DA0001CC0232204017255EF20906E97B70100BA
|
||||||
:104DB000E74B9043D443EF00F05BAA872E883E85F3
|
:104DB0009387C74B9043D443EF00D05BAA872E88DC
|
||||||
:104DC000C285825712583E86C286EF00B05AAA8723
|
:104DC0003E85C285825712583E86C286EF00905AB1
|
||||||
:104DD0002E883ED042D2F25785073EDE7257D25718
|
:104DD000AA872E883ED042D2F25785073EDE725710
|
||||||
:104DE000E36DF7F802DE3DA0F2578E073257BA970F
|
:104DE000D257E36DF7F802DE3DA0F2578E07325737
|
||||||
:104DF00003A847009C43E24672473686BA863E8542
|
:104DF000BA9703A847009C43E24672473686BA86B4
|
||||||
:104E0000C285EF003057AA872E883ECC42CEF2579B
|
:104E00003E85C285EF001057AA872E883ECC42CE41
|
||||||
:104E100085073EDE7257D257E368F7FC8257125877
|
:104E1000F25785073EDE7257D257E368F7FC825798
|
||||||
:104E2000E24672473686BA863E85C285EF208064A8
|
:104E20001258E24672473686BA863E85C285EF2022
|
||||||
:104E3000AA872E883EC842CAC247524801468146C8
|
:104E30006064AA872E883EC842CAC24752480146CB
|
||||||
:104E40003E85C285EF105064AA8763D60702C24729
|
:104E400081463E85C285EF103064AA8763D607028B
|
||||||
:104E50005248054417B701001307C7411043544394
|
:104E5000C2475248054417B701001307A741104342
|
||||||
:104E60003E85C285EF105062AA8763C307000144E4
|
:104E600054433E85C285EF103062AA8763C30700B2
|
||||||
:104E70009377F40F25A0C2475248054417B70100A5
|
:104E700001449377F40F25A0C2475248054417B761
|
||||||
:104E80001307C73C104354433E85C285EF101050B2
|
:104E800001001307A73C104354433E85C285EF1031
|
||||||
:104E9000AA876343F00001449377F40F81C78547E5
|
:104E9000F04FAA876343F00001449377F40F81C772
|
||||||
:104EA000231DF1028317A103E39307ECC2570547C3
|
:104EA0008547231DF1028317A103E39307ECC25743
|
||||||
:104EB0002390E7006DBD5D7186C6A2C42AC6A947CE
|
:104EB00005472390E7006DBD5D7186C6A2C42AC672
|
||||||
:104EC0003EDA231D0102B2473ED8D2578E073E85F7
|
:104EC000A9473EDA231D0102B2473ED8D2578E07CA
|
||||||
:104ED000EFE07FE82AD602D002D202CC02CE02DE78
|
:104ED0003E85EFE05FE82AD602D002D202CC02CEB5
|
||||||
:104EE00095A07255EF20D05AF2578E0732573304EF
|
:104EE00002DE95A07255EF20B05AF2578E07325766
|
||||||
:104EF000F70097B70100938767389043D443EF10CA
|
:104EF0003304F70097B70100938747389043D443B2
|
||||||
:104F00007068AA872E881CC0232204017255EF20E6
|
:104F0000EF105068AA872E881CC023220401725516
|
||||||
:104F1000305897B70100938767369043D443EF101A
|
:104F1000EF20105897B70100938747369043D4434A
|
||||||
:104F20007066AA872E883E85C285825712583E86B3
|
:104F2000EF105066AA872E883E85C2858257125898
|
||||||
:104F3000C286EF003044AA872E883ED042D2F25774
|
:104F30003E86C286EF001044AA872E883ED042D219
|
||||||
:104F400085073EDE7257D257E36DF7F802DE3DA0CB
|
:104F4000F25785073EDE7257D257E36DF7F802DE5F
|
||||||
:104F5000F2578E073257BA9703A847009C43E246A0
|
:104F50003DA0F2578E073257BA9703A847009C43EB
|
||||||
:104F600072473686BA863E85C285EF00B040AA8772
|
:104F6000E24672473686BA863E85C285EF0090409B
|
||||||
:104F70002E883ECC42CEF25785073EDE7257D2577E
|
:104F7000AA872E883ECC42CEF25785073EDE725776
|
||||||
:104F8000E368F7FC82571258E24672473686BA86C3
|
:104F8000D257E368F7FC82571258E24672473686DA
|
||||||
:104F90003E85C285EF20004EAA872E883EC842CAB1
|
:104F9000BA863E85C285EF20E04DAA872E883EC89E
|
||||||
:104FA000C2475248014681463E85C285EF10D04D2A
|
:104FA00042CAC2475248014681463E85C285EF103B
|
||||||
:104FB000AA8763D60702C2475248054417B70100C3
|
:104FB000B04DAA8763D60702C2475248054417B7C7
|
||||||
:104FC0001307472B104354433E85C285EF10D04B47
|
:104FC00001001307272B104354433E85C285EF1081
|
||||||
:104FD000AA8763C3070001449377F40F25A0C24753
|
:104FD000B04BAA8763C3070001449377F40F25A061
|
||||||
:104FE0005248054417B7010013074726104354439E
|
:104FE000C2475248054417B701001307272610434C
|
||||||
:104FF0003E85C285EF109039AA876343F0000144D3
|
:104FF00054433E85C285EF107039AA876343F000A1
|
||||||
:105000009377F40F81C78547231DF1028317A1030E
|
:1050000001449377F40F81C78547231DF10283176D
|
||||||
:10501000E39307ECC25705472390E7006DBD4111AC
|
:10501000A103E39307ECC25705472390E7006DBD5A
|
||||||
:1050200085473EC602C435A8174703001307877596
|
:10502000411185473EC602C435A817470300130740
|
||||||
:10503000A2478607BA9783D70700139707014183D2
|
:105030006775A2478607BA9783D7070013970701BA
|
||||||
:1050400085476304F70002C611A81747030013073A
|
:10504000418385476304F70002C611A81747030090
|
||||||
:105050006773A2478607BA9723900700A247850780
|
:1050500013074773A2478607BA9723900700A24712
|
||||||
:105060003EC422478D47E3D1E7FCB2473E8541016C
|
:1050600085073EC422478D47E3D1E7FCB2473E8522
|
||||||
:1050700082800000B305B500930705006386B70082
|
:1050700041018280B305B500930705006386B70040
|
||||||
:1050800003C70700631607003385A7406780000049
|
:1050800003C70700631607003385A7406780000049
|
||||||
:10509000938717006FF09FFE130101FD23229102F9
|
:10509000938717006FF09FFE130101FD23229102F9
|
||||||
:1050A000232A5101232611022324810223202103D4
|
:1050A000232A5101232611022324810223202103D4
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -375,13 +375,13 @@ class DBusDimension extends VexRiscvDimension("DBus") {
|
||||||
trait CatchAllPosition
|
trait CatchAllPosition
|
||||||
|
|
||||||
//TODO CSR without exception
|
//TODO CSR without exception
|
||||||
class CsrDimension extends VexRiscvDimension("Csr") {
|
class CsrDimension(freertos : String) extends VexRiscvDimension("Csr") {
|
||||||
override def randomPositionImpl(universes: Seq[ConfigUniverse], r: Random) = {
|
override def randomPositionImpl(universes: Seq[ConfigUniverse], r: Random) = {
|
||||||
val catchAll = universes.contains(VexRiscvUniverse.CATCH_ALL)
|
val catchAll = universes.contains(VexRiscvUniverse.CATCH_ALL)
|
||||||
if(catchAll){
|
if(catchAll){
|
||||||
new VexRiscvPosition("All") with CatchAllPosition{
|
new VexRiscvPosition("All") with CatchAllPosition{
|
||||||
override def applyOn(config: VexRiscvConfig): Unit = config.plugins += new CsrPlugin(CsrPluginConfig.all(0x80000020l))
|
override def applyOn(config: VexRiscvConfig): Unit = config.plugins += new CsrPlugin(CsrPluginConfig.all(0x80000020l))
|
||||||
override def testParam = "FREERTOS=4"
|
override def testParam = s"FREERTOS=$freertos"
|
||||||
}
|
}
|
||||||
} else if(r.nextDouble() < 0.2){
|
} else if(r.nextDouble() < 0.2){
|
||||||
new VexRiscvPosition("AllNoException") with CatchAllPosition{
|
new VexRiscvPosition("AllNoException") with CatchAllPosition{
|
||||||
|
@ -457,7 +457,7 @@ class TestIndividualFeatures extends FunSuite {
|
||||||
new HazardDimension,
|
new HazardDimension,
|
||||||
new RegFileDimension,
|
new RegFileDimension,
|
||||||
new SrcDimension,
|
new SrcDimension,
|
||||||
new CsrDimension,
|
new CsrDimension(sys.env.getOrElse("VEXRISCV_FREERTOS", "4")),
|
||||||
new DecoderDimension,
|
new DecoderDimension,
|
||||||
new DebugDimension
|
new DebugDimension
|
||||||
)
|
)
|
||||||
|
@ -494,11 +494,11 @@ class TestIndividualFeatures extends FunSuite {
|
||||||
|
|
||||||
test(prefix + name + "_test") {
|
test(prefix + name + "_test") {
|
||||||
val debug = false
|
val debug = false
|
||||||
val stdCmd = (if(debug) "make clean run REDO=1 TRACE=yes TRACE_ACCESS=yes MMU=no STOP_ON_ERROR=yes DHRYSTONE=no THREAD_COUNT=1 TRACE_START=4000000 " else "make clean run REDO=10 TRACE=no MMU=no THREAD_COUNT=2 ") + s" SEED=${testSeed} "
|
val stdCmd = (if(debug) "make clean run REDO=1 TRACE=yes TRACE_ACCESS=yes MMU=no STOP_ON_ERROR=yes DHRYSTONE=no THREAD_COUNT=1 TRACE_START=0 " else "make clean run REDO=10 TRACE=no MMU=no THREAD_COUNT=4 ") + s" SEED=${testSeed} "
|
||||||
// val stdCmd = "make clean run REDO=40 DHRYSTONE=no STOP_ON_ERROR=yes TRACE=yess MMU=no"
|
// val stdCmd = "make clean run REDO=40 DHRYSTONE=no STOP_ON_ERROR=yes TRACE=yess MMU=no"
|
||||||
|
|
||||||
val testCmd = stdCmd + (positionsToApply).map(_.testParam).mkString(" ")
|
val testCmd = stdCmd + (positionsToApply).map(_.testParam).mkString(" ")
|
||||||
val str = doCmd(testCmd.replace("FREERTOS","miaou")) //TODO remove
|
val str = doCmd(testCmd)
|
||||||
assert(!str.contains("FAIL"))
|
assert(!str.contains("FAIL"))
|
||||||
// val intFind = "(\\d+\\.?)+".r
|
// val intFind = "(\\d+\\.?)+".r
|
||||||
// val dmips = intFind.findFirstIn("DMIPS per Mhz\\: (\\d+.?)+".r.findAllIn(str).toList.last).get.toDouble
|
// val dmips = intFind.findFirstIn("DMIPS per Mhz\\: (\\d+.?)+".r.findAllIn(str).toList.last).get.toDouble
|
||||||
|
@ -508,15 +508,15 @@ class TestIndividualFeatures extends FunSuite {
|
||||||
// dimensions.foreach(d => d.positions.foreach(p => p.dimension = d))
|
// dimensions.foreach(d => d.positions.foreach(p => p.dimension = d))
|
||||||
|
|
||||||
val testId : Option[mutable.HashSet[Int]] = None
|
val testId : Option[mutable.HashSet[Int]] = None
|
||||||
val seed = Random.nextLong()
|
// val seed = Random.nextLong()
|
||||||
|
|
||||||
// val testId = Some(mutable.HashSet(18,34,77,85,118,129,132,134,152,167,175,188,191,198,199)) //37/29 sp_flop_rv32i_O3
|
// val testId = Some(mutable.HashSet(18,34,77,85,118,129,132,134,152,167,175,188,191,198,199)) //37/29 sp_flop_rv32i_O3
|
||||||
//val testId = Some(mutable.HashSet(18))
|
//val testId = Some(mutable.HashSet(18))
|
||||||
// val testId = Some(mutable.HashSet(129, 134))
|
// val testId = Some(mutable.HashSet(129, 134))
|
||||||
// val seed = -2412372746600605141l
|
val seed = -2412372746600605141l
|
||||||
|
|
||||||
|
|
||||||
//val testId = Some(mutable.HashSet(37))
|
// val testId = Some(mutable.HashSet(1))
|
||||||
// val seed = 4331444545509090137l
|
// val seed = 4331444545509090137l
|
||||||
|
|
||||||
val rand = new Random(seed)
|
val rand = new Random(seed)
|
||||||
|
@ -537,7 +537,7 @@ class TestIndividualFeatures extends FunSuite {
|
||||||
if(testId.isEmpty || testId.get.contains(i))
|
if(testId.isEmpty || testId.get.contains(i))
|
||||||
doTest(positions," random_" + i + "_", testSeed)
|
doTest(positions," random_" + i + "_", testSeed)
|
||||||
}
|
}
|
||||||
|
//TODO main.cpp freertos
|
||||||
// println(s"${usedPositions.size}/$positionsCount positions")
|
// println(s"${usedPositions.size}/$positionsCount positions")
|
||||||
|
|
||||||
// for (dimension <- dimensions) {
|
// for (dimension <- dimensions) {
|
||||||
|
@ -548,3 +548,20 @@ class TestIndividualFeatures extends FunSuite {
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
val seed = -2412372746600605141l
|
||||||
|
|
||||||
|
129
|
||||||
|
FAIL AltQTest_rv32i_O3
|
||||||
|
FAIL AltQTest_rv32ic_O3
|
||||||
|
FAIL GenQTest_rv32i_O0
|
||||||
|
|
||||||
|
134
|
||||||
|
FAIL AltQTest_rv32i_O3
|
||||||
|
|
||||||
|
val seed = 4331444545509090137l
|
||||||
|
1 => flops i O0
|
||||||
|
*/
|
Loading…
Reference in New Issue