fetch_impl.hh (3802:e8f55dfb0f56) | fetch_impl.hh (3867:807483cfab77) |
---|---|
1/* 2 * Copyright (c) 2004-2006 The Regents of The University of Michigan 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 305 unchanged lines hidden (view full) --- 314template<class Impl> 315void 316DefaultFetch<Impl>::initStage() 317{ 318 // Setup PC and nextPC with initial state. 319 for (int tid = 0; tid < numThreads; tid++) { 320 PC[tid] = cpu->readPC(tid); 321 nextPC[tid] = cpu->readNextPC(tid); | 1/* 2 * Copyright (c) 2004-2006 The Regents of The University of Michigan 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 305 unchanged lines hidden (view full) --- 314template<class Impl> 315void 316DefaultFetch<Impl>::initStage() 317{ 318 // Setup PC and nextPC with initial state. 319 for (int tid = 0; tid < numThreads; tid++) { 320 PC[tid] = cpu->readPC(tid); 321 nextPC[tid] = cpu->readNextPC(tid); |
322#if ISA_HAS_DELAY_SLOT |
|
322 nextNPC[tid] = cpu->readNextNPC(tid); | 323 nextNPC[tid] = cpu->readNextNPC(tid); |
324#endif |
|
323 } 324 325 // Size of cache block. 326 cacheBlkSize = icachePort->peerBlockSize(); 327 328 // Create mask to get rid of offset bits. 329 cacheBlkMask = (cacheBlkSize - 1); 330 --- 166 unchanged lines hidden (view full) --- 497{ 498 // Do branch prediction check here. 499 // A bit of a misnomer...next_PC is actually the current PC until 500 // this function updates it. 501 bool predict_taken; 502 503 if (!inst->isControl()) { 504#if ISA_HAS_DELAY_SLOT | 325 } 326 327 // Size of cache block. 328 cacheBlkSize = icachePort->peerBlockSize(); 329 330 // Create mask to get rid of offset bits. 331 cacheBlkMask = (cacheBlkSize - 1); 332 --- 166 unchanged lines hidden (view full) --- 499{ 500 // Do branch prediction check here. 501 // A bit of a misnomer...next_PC is actually the current PC until 502 // this function updates it. 503 bool predict_taken; 504 505 if (!inst->isControl()) { 506#if ISA_HAS_DELAY_SLOT |
505 next_PC = next_NPC; 506 next_NPC = next_NPC + instSize; 507 inst->setPredTarg(next_PC, next_NPC); | 507 Addr cur_PC = next_PC; 508 next_PC = cur_PC + instSize; //next_NPC; 509 next_NPC = cur_PC + (2 * instSize);//next_NPC + instSize; 510 inst->setPredTarg(next_NPC); |
508#else 509 next_PC = next_PC + instSize; | 511#else 512 next_PC = next_PC + instSize; |
510 inst->setPredTarg(next_PC, next_PC + sizeof(TheISA::MachInst)); | 513 inst->setPredTarg(next_PC); |
511#endif | 514#endif |
512 inst->setPredTaken(false); | |
513 return false; 514 } 515 516 int tid = inst->threadNumber; 517#if ISA_HAS_DELAY_SLOT 518 Addr pred_PC = next_PC; 519 predict_taken = branchPred.predict(inst, pred_PC, tid); 520 521 if (predict_taken) { | 515 return false; 516 } 517 518 int tid = inst->threadNumber; 519#if ISA_HAS_DELAY_SLOT 520 Addr pred_PC = next_PC; 521 predict_taken = branchPred.predict(inst, pred_PC, tid); 522 523 if (predict_taken) { |
522 DPRINTF(Fetch, "[tid:%i]: Branch predicted to be taken.\n", tid); | 524 DPRINTF(Fetch, "[tid:%i]: Branch predicted to be true.\n", tid); |
523 } else { | 525 } else { |
524 DPRINTF(Fetch, "[tid:%i]: Branch predicted to be not taken.\n", tid); | 526 DPRINTF(Fetch, "[tid:%i]: Branch predicted to be false.\n", tid); |
525 } 526 | 527 } 528 |
527 next_PC = next_NPC; | |
528 if (predict_taken) { | 529 if (predict_taken) { |
530 next_PC = next_NPC; |
|
529 next_NPC = pred_PC; | 531 next_NPC = pred_PC; |
532 |
|
530 // Update delay slot info 531 ++delaySlotInfo[tid].numInsts; 532 delaySlotInfo[tid].targetAddr = pred_PC; 533 DPRINTF(Fetch, "[tid:%i]: %i delay slot inst(s) to process.\n", tid, 534 delaySlotInfo[tid].numInsts); | 533 // Update delay slot info 534 ++delaySlotInfo[tid].numInsts; 535 delaySlotInfo[tid].targetAddr = pred_PC; 536 DPRINTF(Fetch, "[tid:%i]: %i delay slot inst(s) to process.\n", tid, 537 delaySlotInfo[tid].numInsts); |
535 } else { | 538 } else { // !predict_taken 539 if (inst->isCondDelaySlot()) { 540 next_PC = pred_PC; 541 // The delay slot is skipped here if there is on 542 // prediction 543 } else { 544 next_PC = next_NPC; 545 // No need to declare a delay slot here since 546 // there is no for the pred. target to jump 547 } 548 |
536 next_NPC = next_NPC + instSize; 537 } 538#else 539 predict_taken = branchPred.predict(inst, next_PC, tid); 540#endif | 549 next_NPC = next_NPC + instSize; 550 } 551#else 552 predict_taken = branchPred.predict(inst, next_PC, tid); 553#endif |
541 DPRINTF(Fetch, "[tid:%i]: Branch predicted to go to %#x and then %#x.\n", 542 tid, next_PC, next_NPC); 543 inst->setPredTarg(next_PC, next_NPC); 544 inst->setPredTaken(predict_taken); | |
545 546 ++fetchedBranches; 547 548 if (predict_taken) { 549 ++predictedBranches; 550 } 551 552 return predict_taken; --- 104 unchanged lines hidden (view full) --- 657 } 658 659 ret_fault = fault; 660 return true; 661} 662 663template <class Impl> 664inline void | 554 555 ++fetchedBranches; 556 557 if (predict_taken) { 558 ++predictedBranches; 559 } 560 561 return predict_taken; --- 104 unchanged lines hidden (view full) --- 666 } 667 668 ret_fault = fault; 669 return true; 670} 671 672template <class Impl> 673inline void |
665DefaultFetch 666 const Addr &new_NPC, unsigned tid) | 674DefaultFetch<Impl>::doSquash(const Addr &new_PC, unsigned tid) |
667{ | 675{ |
668 DPRINTF(Fetch, "[tid:%i]: Squashing, setting PC to: %#x, NPC to: %#x.\n", 669 tid, new_PC, new_NPC); | 676 DPRINTF(Fetch, "[tid:%i]: Squashing, setting PC to: %#x.\n", 677 tid, new_PC); |
670 671 PC[tid] = new_PC; | 678 679 PC[tid] = new_PC; |
672 nextPC[tid] = new_NPC; 673 nextNPC[tid] = new_NPC + instSize; | 680 nextPC[tid] = new_PC + instSize; 681 nextNPC[tid] = new_PC + (2 * instSize); |
674 675 // Clear the icache miss if it's outstanding. 676 if (fetchStatus[tid] == IcacheWaitResponse) { 677 DPRINTF(Fetch, "[tid:%i]: Squashing outstanding Icache miss.\n", 678 tid); 679 memReq[tid] = NULL; 680 } 681 --- 9 unchanged lines hidden (view full) --- 691 692 fetchStatus[tid] = Squashing; 693 694 ++fetchSquashCycles; 695} 696 697template<class Impl> 698void | 682 683 // Clear the icache miss if it's outstanding. 684 if (fetchStatus[tid] == IcacheWaitResponse) { 685 DPRINTF(Fetch, "[tid:%i]: Squashing outstanding Icache miss.\n", 686 tid); 687 memReq[tid] = NULL; 688 } 689 --- 9 unchanged lines hidden (view full) --- 699 700 fetchStatus[tid] = Squashing; 701 702 ++fetchSquashCycles; 703} 704 705template<class Impl> 706void |
699DefaultFetch<Impl>::squashFromDecode(const Addr &new_PC, const Addr &new_NPC, | 707DefaultFetch |
700 const InstSeqNum &seq_num, 701 unsigned tid) 702{ 703 DPRINTF(Fetch, "[tid:%i]: Squashing from decode.\n",tid); 704 | 708 const InstSeqNum &seq_num, 709 unsigned tid) 710{ 711 DPRINTF(Fetch, "[tid:%i]: Squashing from decode.\n",tid); 712 |
705 doSquash(new_PC, new_NPC, tid); | 713 doSquash(new_PC, tid); |
706 707#if ISA_HAS_DELAY_SLOT 708 if (seq_num <= delaySlotInfo[tid].branchSeqNum) { 709 delaySlotInfo[tid].numInsts = 0; 710 delaySlotInfo[tid].targetAddr = 0; 711 delaySlotInfo[tid].targetReady = false; 712 } 713#endif --- 29 unchanged lines hidden (view full) --- 743 return ret_val; 744} 745 746template<class Impl> 747typename DefaultFetch<Impl>::FetchStatus 748DefaultFetch<Impl>::updateFetchStatus() 749{ 750 //Check Running | 714 715#if ISA_HAS_DELAY_SLOT 716 if (seq_num <= delaySlotInfo[tid].branchSeqNum) { 717 delaySlotInfo[tid].numInsts = 0; 718 delaySlotInfo[tid].targetAddr = 0; 719 delaySlotInfo[tid].targetReady = false; 720 } 721#endif --- 29 unchanged lines hidden (view full) --- 751 return ret_val; 752} 753 754template<class Impl> 755typename DefaultFetch<Impl>::FetchStatus 756DefaultFetch<Impl>::updateFetchStatus() 757{ 758 //Check Running |
751 std::list<unsigned>::iterator threads = (*activeThreads).begin(); | 759 std::list<unsigned>::iterator threads = activeThreads->begin(); 760 std::list<unsigned>::iterator end = activeThreads->end(); |
752 | 761 |
753 while (threads != (*activeThreads).end()) { 754 | 762 while (threads != end) { |
755 unsigned tid = *threads++; 756 757 if (fetchStatus[tid] == Running || 758 fetchStatus[tid] == Squashing || 759 fetchStatus[tid] == IcacheAccessComplete) { 760 761 if (_status == Inactive) { 762 DPRINTF(Activity, "[tid:%i]: Activating stage.\n",tid); --- 17 unchanged lines hidden (view full) --- 780 cpu->deactivateStage(O3CPU::FetchIdx); 781 } 782 783 return Inactive; 784} 785 786template <class Impl> 787void | 763 unsigned tid = *threads++; 764 765 if (fetchStatus[tid] == Running || 766 fetchStatus[tid] == Squashing || 767 fetchStatus[tid] == IcacheAccessComplete) { 768 769 if (_status == Inactive) { 770 DPRINTF(Activity, "[tid:%i]: Activating stage.\n",tid); --- 17 unchanged lines hidden (view full) --- 788 cpu->deactivateStage(O3CPU::FetchIdx); 789 } 790 791 return Inactive; 792} 793 794template <class Impl> 795void |
788DefaultFetch<Impl>::squash(const Addr &new_PC, const Addr &new_NPC, 789 const InstSeqNum &seq_num, | 796DefaultFetch<Impl>::squash(const Addr &new_PC, const InstSeqNum &seq_num, |
790 bool squash_delay_slot, unsigned tid) 791{ 792 DPRINTF(Fetch, "[tid:%u]: Squash from commit.\n",tid); 793 | 797 bool squash_delay_slot, unsigned tid) 798{ 799 DPRINTF(Fetch, "[tid:%u]: Squash from commit.\n",tid); 800 |
794 doSquash(new_PC, new_NPC, tid); | 801 doSquash(new_PC, tid); |
795 796#if ISA_HAS_DELAY_SLOT 797 if (seq_num <= delaySlotInfo[tid].branchSeqNum) { 798 delaySlotInfo[tid].numInsts = 0; 799 delaySlotInfo[tid].targetAddr = 0; 800 delaySlotInfo[tid].targetReady = false; 801 } 802 --- 4 unchanged lines hidden (view full) --- 807 cpu->removeInstsNotInROB(tid, true, 0); 808#endif 809} 810 811template <class Impl> 812void 813DefaultFetch<Impl>::tick() 814{ | 802 803#if ISA_HAS_DELAY_SLOT 804 if (seq_num <= delaySlotInfo[tid].branchSeqNum) { 805 delaySlotInfo[tid].numInsts = 0; 806 delaySlotInfo[tid].targetAddr = 0; 807 delaySlotInfo[tid].targetReady = false; 808 } 809 --- 4 unchanged lines hidden (view full) --- 814 cpu->removeInstsNotInROB(tid, true, 0); 815#endif 816} 817 818template <class Impl> 819void 820DefaultFetch<Impl>::tick() 821{ |
815 std::list<unsigned>::iterator threads = (*activeThreads).begin(); | 822 std::list<unsigned>::iterator threads = activeThreads->begin(); 823 std::list<unsigned>::iterator end = activeThreads->end(); |
816 bool status_change = false; 817 818 wroteToTimeBuffer = false; 819 | 824 bool status_change = false; 825 826 wroteToTimeBuffer = false; 827 |
820 while (threads != (*activeThreads).end()) { | 828 while (threads != end) { |
821 unsigned tid = *threads++; 822 823 // Check the signals for each thread to determine the proper status 824 // for each thread. 825 bool updated_status = checkSignalsAndUpdate(tid); 826 status_change = status_change || updated_status; 827 } 828 --- 87 unchanged lines hidden (view full) --- 916 917#if ISA_HAS_DELAY_SLOT 918 InstSeqNum doneSeqNum = fromCommit->commitInfo[tid].bdelayDoneSeqNum; 919#else 920 InstSeqNum doneSeqNum = fromCommit->commitInfo[tid].doneSeqNum; 921#endif 922 // In any case, squash. 923 squash(fromCommit->commitInfo[tid].nextPC, | 829 unsigned tid = *threads++; 830 831 // Check the signals for each thread to determine the proper status 832 // for each thread. 833 bool updated_status = checkSignalsAndUpdate(tid); 834 status_change = status_change || updated_status; 835 } 836 --- 87 unchanged lines hidden (view full) --- 924 925#if ISA_HAS_DELAY_SLOT 926 InstSeqNum doneSeqNum = fromCommit->commitInfo[tid].bdelayDoneSeqNum; 927#else 928 InstSeqNum doneSeqNum = fromCommit->commitInfo[tid].doneSeqNum; 929#endif 930 // In any case, squash. 931 squash(fromCommit->commitInfo[tid].nextPC, |
924 fromCommit->commitInfo[tid].nextNPC, | |
925 doneSeqNum, 926 fromCommit->commitInfo[tid].squashDelaySlot, 927 tid); 928 929 // Also check if there's a mispredict that happened. 930 if (fromCommit->commitInfo[tid].branchMispredict) { 931 branchPred.squash(fromCommit->commitInfo[tid].doneSeqNum, 932 fromCommit->commitInfo[tid].nextPC, --- 41 unchanged lines hidden (view full) --- 974 975#if ISA_HAS_DELAY_SLOT 976 InstSeqNum doneSeqNum = fromDecode->decodeInfo[tid].bdelayDoneSeqNum; 977#else 978 InstSeqNum doneSeqNum = fromDecode->decodeInfo[tid].doneSeqNum; 979#endif 980 // Squash unless we're already squashing 981 squashFromDecode(fromDecode->decodeInfo[tid].nextPC, | 932 doneSeqNum, 933 fromCommit->commitInfo[tid].squashDelaySlot, 934 tid); 935 936 // Also check if there's a mispredict that happened. 937 if (fromCommit->commitInfo[tid].branchMispredict) { 938 branchPred.squash(fromCommit->commitInfo[tid].doneSeqNum, 939 fromCommit->commitInfo[tid].nextPC, --- 41 unchanged lines hidden (view full) --- 981 982#if ISA_HAS_DELAY_SLOT 983 InstSeqNum doneSeqNum = fromDecode->decodeInfo[tid].bdelayDoneSeqNum; 984#else 985 InstSeqNum doneSeqNum = fromDecode->decodeInfo[tid].doneSeqNum; 986#endif 987 // Squash unless we're already squashing 988 squashFromDecode(fromDecode->decodeInfo[tid].nextPC, |
982 fromDecode->decodeInfo[tid].nextNPC, | |
983 doneSeqNum, 984 tid); 985 986 return true; 987 } 988 } 989 990 if (checkStall(tid) && --- 40 unchanged lines hidden (view full) --- 1031 return; 1032 } 1033 1034 DPRINTF(Fetch, "Attempting to fetch from [tid:%i]\n", tid); 1035 1036 // The current PC. 1037 Addr &fetch_PC = PC[tid]; 1038 | 989 doneSeqNum, 990 tid); 991 992 return true; 993 } 994 } 995 996 if (checkStall(tid) && --- 40 unchanged lines hidden (view full) --- 1037 return; 1038 } 1039 1040 DPRINTF(Fetch, "Attempting to fetch from [tid:%i]\n", tid); 1041 1042 // The current PC. 1043 Addr &fetch_PC = PC[tid]; 1044 |
1039 Addr &fetch_NPC = nextPC[tid]; 1040 | |
1041 // Fault code for memory access. 1042 Fault fault = NoFault; 1043 1044 // If returning from the delay of a cache miss, then update the status 1045 // to running, otherwise do the cache access. Possibly move this up 1046 // to tick() function. 1047 if (fetchStatus[tid] == IcacheAccessComplete) { 1048 DPRINTF(Fetch, "[tid:%i]: Icache miss is complete.\n", --- 40 unchanged lines hidden (view full) --- 1089 // If we had a stall due to an icache miss, then return. 1090 if (fetchStatus[tid] == IcacheWaitResponse) { 1091 ++icacheStallCycles; 1092 status_change = true; 1093 return; 1094 } 1095 1096 Addr next_PC = fetch_PC; | 1045 // Fault code for memory access. 1046 Fault fault = NoFault; 1047 1048 // If returning from the delay of a cache miss, then update the status 1049 // to running, otherwise do the cache access. Possibly move this up 1050 // to tick() function. 1051 if (fetchStatus[tid] == IcacheAccessComplete) { 1052 DPRINTF(Fetch, "[tid:%i]: Icache miss is complete.\n", --- 40 unchanged lines hidden (view full) --- 1093 // If we had a stall due to an icache miss, then return. 1094 if (fetchStatus[tid] == IcacheWaitResponse) { 1095 ++icacheStallCycles; 1096 status_change = true; 1097 return; 1098 } 1099 1100 Addr next_PC = fetch_PC; |
1097 Addr next_NPC = fetch_NPC; 1098 | 1101 Addr next_NPC = next_PC + instSize; |
1099 InstSeqNum inst_seq; 1100 MachInst inst; 1101 ExtMachInst ext_inst; 1102 // @todo: Fix this hack. 1103 unsigned offset = (fetch_PC & cacheBlkMask) & ~3; 1104 1105 if (fault == NoFault) { 1106 // If the read of the first instruction was successful, then grab the 1107 // instructions from the rest of the cache line and put them into the 1108 // queue heading to decode. 1109 1110 DPRINTF(Fetch, "[tid:%i]: Adding instructions to queue to " 1111 "decode.\n",tid); 1112 1113 // Need to keep track of whether or not a predicted branch 1114 // ended this fetch block. 1115 bool predicted_branch = false; 1116 | 1102 InstSeqNum inst_seq; 1103 MachInst inst; 1104 ExtMachInst ext_inst; 1105 // @todo: Fix this hack. 1106 unsigned offset = (fetch_PC & cacheBlkMask) & ~3; 1107 1108 if (fault == NoFault) { 1109 // If the read of the first instruction was successful, then grab the 1110 // instructions from the rest of the cache line and put them into the 1111 // queue heading to decode. 1112 1113 DPRINTF(Fetch, "[tid:%i]: Adding instructions to queue to " 1114 "decode.\n",tid); 1115 1116 // Need to keep track of whether or not a predicted branch 1117 // ended this fetch block. 1118 bool predicted_branch = false; 1119 |
1120 // Need to keep track of whether or not a delay slot 1121 // instruction has been fetched 1122 |
|
1117 for (; 1118 offset < cacheBlkSize && 1119 numInst < fetchWidth && | 1123 for (; 1124 offset < cacheBlkSize && 1125 numInst < fetchWidth && |
1120 !predicted_branch; | 1126 (!predicted_branch || delaySlotInfo[tid].numInsts > 0); |
1121 ++numInst) { 1122 | 1127 ++numInst) { 1128 |
1123 // If we're branching after this instruction, quite fetching 1124 // from the same block then. 1125 predicted_branch = 1126 (fetch_PC + sizeof(TheISA::MachInst) != fetch_NPC); 1127 | |
1128 // Get a sequence number. 1129 inst_seq = cpu->getAndIncrementInstSeq(); 1130 1131 // Make sure this is a valid index. 1132 assert(offset <= cacheBlkSize - instSize); 1133 1134 // Get the instruction from the array of the cache line. 1135 inst = TheISA::gtoh(*reinterpret_cast<TheISA::MachInst *> 1136 (&cacheData[tid][offset])); 1137 1138#if THE_ISA == ALPHA_ISA 1139 ext_inst = TheISA::makeExtMI(inst, fetch_PC); 1140#elif THE_ISA == SPARC_ISA 1141 ext_inst = TheISA::makeExtMI(inst, cpu->thread[tid]->getTC()); 1142#elif THE_ISA == MIPS_ISA 1143 ext_inst = TheISA::makeExtMI(inst, cpu->thread[tid]->getTC()); 1144#endif 1145 1146 // Create a new DynInst from the instruction fetched. | 1129 // Get a sequence number. 1130 inst_seq = cpu->getAndIncrementInstSeq(); 1131 1132 // Make sure this is a valid index. 1133 assert(offset <= cacheBlkSize - instSize); 1134 1135 // Get the instruction from the array of the cache line. 1136 inst = TheISA::gtoh(*reinterpret_cast<TheISA::MachInst *> 1137 (&cacheData[tid][offset])); 1138 1139#if THE_ISA == ALPHA_ISA 1140 ext_inst = TheISA::makeExtMI(inst, fetch_PC); 1141#elif THE_ISA == SPARC_ISA 1142 ext_inst = TheISA::makeExtMI(inst, cpu->thread[tid]->getTC()); 1143#elif THE_ISA == MIPS_ISA 1144 ext_inst = TheISA::makeExtMI(inst, cpu->thread[tid]->getTC()); 1145#endif 1146 1147 // Create a new DynInst from the instruction fetched. |
1147 DynInstPtr instruction = new DynInst(ext_inst, 1148 fetch_PC, fetch_NPC, 1149 next_PC, next_NPC, | 1148 DynInstPtr instruction = new DynInst(ext_inst, fetch_PC, 1149 next_PC, |
1150 inst_seq, cpu); 1151 instruction->setTid(tid); 1152 1153 instruction->setASID(tid); 1154 1155 instruction->setThreadState(cpu->thread[tid]); 1156 1157 DPRINTF(Fetch, "[tid:%i]: Instruction PC %#x created " 1158 "[sn:%lli]\n", 1159 tid, instruction->readPC(), inst_seq); 1160 | 1150 inst_seq, cpu); 1151 instruction->setTid(tid); 1152 1153 instruction->setASID(tid); 1154 1155 instruction->setThreadState(cpu->thread[tid]); 1156 1157 DPRINTF(Fetch, "[tid:%i]: Instruction PC %#x created " 1158 "[sn:%lli]\n", 1159 tid, instruction->readPC(), inst_seq); 1160 |
1161 DPRINTF(Fetch, "[tid:%i]: MachInst is %#x\n", tid, ext_inst); 1162 | |
1163 DPRINTF(Fetch, "[tid:%i]: Instruction is: %s\n", 1164 tid, instruction->staticInst->disassemble(fetch_PC)); 1165 1166 instruction->traceData = 1167 Trace::getInstRecord(curTick, cpu->tcBase(tid), 1168 instruction->staticInst, 1169 instruction->readPC()); 1170 | 1161 DPRINTF(Fetch, "[tid:%i]: Instruction is: %s\n", 1162 tid, instruction->staticInst->disassemble(fetch_PC)); 1163 1164 instruction->traceData = 1165 Trace::getInstRecord(curTick, cpu->tcBase(tid), 1166 instruction->staticInst, 1167 instruction->readPC()); 1168 |
1171 lookupAndUpdateNextPC(instruction, next_PC, next_NPC); | 1169 predicted_branch = lookupAndUpdateNextPC(instruction, next_PC, 1170 next_NPC); |
1172 1173 // Add instruction to the CPU's list of instructions. 1174 instruction->setInstListIt(cpu->addInst(instruction)); 1175 1176 // Write the instruction to the first slot in the queue 1177 // that heads to decode. 1178 toDecode->insts[numInst] = instruction; 1179 1180 toDecode->size++; 1181 1182 // Increment stat of fetched instructions. 1183 ++fetchedInsts; 1184 1185 // Move to the next instruction, unless we have a branch. 1186 fetch_PC = next_PC; | 1171 1172 // Add instruction to the CPU's list of instructions. 1173 instruction->setInstListIt(cpu->addInst(instruction)); 1174 1175 // Write the instruction to the first slot in the queue 1176 // that heads to decode. 1177 toDecode->insts[numInst] = instruction; 1178 1179 toDecode->size++; 1180 1181 // Increment stat of fetched instructions. 1182 ++fetchedInsts; 1183 1184 // Move to the next instruction, unless we have a branch. 1185 fetch_PC = next_PC; |
1187 fetch_NPC = next_NPC; | |
1188 1189 if (instruction->isQuiesce()) { 1190 DPRINTF(Fetch, "Quiesce instruction encountered, halting fetch!", 1191 curTick); 1192 fetchStatus[tid] = QuiescePending; 1193 ++numInst; 1194 status_change = true; 1195 break; 1196 } 1197 1198 offset += instSize; | 1186 1187 if (instruction->isQuiesce()) { 1188 DPRINTF(Fetch, "Quiesce instruction encountered, halting fetch!", 1189 curTick); 1190 fetchStatus[tid] = QuiescePending; 1191 ++numInst; 1192 status_change = true; 1193 break; 1194 } 1195 1196 offset += instSize; |
1197 1198#if ISA_HAS_DELAY_SLOT 1199 if (predicted_branch) { 1200 delaySlotInfo[tid].branchSeqNum = inst_seq; 1201 1202 DPRINTF(Fetch, "[tid:%i]: Delay slot branch set to [sn:%i]\n", 1203 tid, inst_seq); 1204 continue; 1205 } else if (delaySlotInfo[tid].numInsts > 0) { 1206 --delaySlotInfo[tid].numInsts; 1207 1208 // It's OK to set PC to target of branch 1209 if (delaySlotInfo[tid].numInsts == 0) { 1210 delaySlotInfo[tid].targetReady = true; 1211 1212 // Break the looping condition 1213 predicted_branch = true; 1214 } 1215 1216 DPRINTF(Fetch, "[tid:%i]: %i delay slot inst(s) left to" 1217 " process.\n", tid, delaySlotInfo[tid].numInsts); 1218 } 1219#endif |
|
1199 } 1200 1201 if (offset >= cacheBlkSize) { 1202 DPRINTF(Fetch, "[tid:%i]: Done fetching, reached the end of cache " 1203 "block.\n", tid); 1204 } else if (numInst >= fetchWidth) { 1205 DPRINTF(Fetch, "[tid:%i]: Done fetching, reached fetch bandwidth " 1206 "for this cycle.\n", tid); | 1220 } 1221 1222 if (offset >= cacheBlkSize) { 1223 DPRINTF(Fetch, "[tid:%i]: Done fetching, reached the end of cache " 1224 "block.\n", tid); 1225 } else if (numInst >= fetchWidth) { 1226 DPRINTF(Fetch, "[tid:%i]: Done fetching, reached fetch bandwidth " 1227 "for this cycle.\n", tid); |
1207 } else if (predicted_branch) { | 1228 } else if (predicted_branch && delaySlotInfo[tid].numInsts <= 0) { |
1208 DPRINTF(Fetch, "[tid:%i]: Done fetching, predicted branch " 1209 "instruction encountered.\n", tid); 1210 } 1211 } 1212 1213 if (numInst > 0) { 1214 wroteToTimeBuffer = true; 1215 } 1216 1217 // Now that fetching is completed, update the PC to signify what the next 1218 // cycle will be. 1219 if (fault == NoFault) { 1220#if ISA_HAS_DELAY_SLOT 1221 if (delaySlotInfo[tid].targetReady && 1222 delaySlotInfo[tid].numInsts == 0) { 1223 // Set PC to target | 1229 DPRINTF(Fetch, "[tid:%i]: Done fetching, predicted branch " 1230 "instruction encountered.\n", tid); 1231 } 1232 } 1233 1234 if (numInst > 0) { 1235 wroteToTimeBuffer = true; 1236 } 1237 1238 // Now that fetching is completed, update the PC to signify what the next 1239 // cycle will be. 1240 if (fault == NoFault) { 1241#if ISA_HAS_DELAY_SLOT 1242 if (delaySlotInfo[tid].targetReady && 1243 delaySlotInfo[tid].numInsts == 0) { 1244 // Set PC to target |
1224 PC[tid] = next_PC; 1225 nextPC[tid] = next_NPC; 1226 nextNPC[tid] = next_NPC + instSize; | 1245 PC[tid] = delaySlotInfo[tid].targetAddr; //next_PC 1246 nextPC[tid] = next_PC + instSize; //next_NPC 1247 nextNPC[tid] = next_PC + (2 * instSize); |
1227 1228 delaySlotInfo[tid].targetReady = false; 1229 } else { 1230 PC[tid] = next_PC; 1231 nextPC[tid] = next_NPC; 1232 nextNPC[tid] = next_NPC + instSize; 1233 } 1234 --- 103 unchanged lines hidden (view full) --- 1338 1339 case Branch: 1340 return branchCount(); 1341 1342 default: 1343 return -1; 1344 } 1345 } else { | 1248 1249 delaySlotInfo[tid].targetReady = false; 1250 } else { 1251 PC[tid] = next_PC; 1252 nextPC[tid] = next_NPC; 1253 nextNPC[tid] = next_NPC + instSize; 1254 } 1255 --- 103 unchanged lines hidden (view full) --- 1359 1360 case Branch: 1361 return branchCount(); 1362 1363 default: 1364 return -1; 1365 } 1366 } else { |
1346 int tid = *((*activeThreads).begin()); | 1367 std::list<unsigned>::iterator thread = activeThreads->begin(); 1368 assert(thread != activeThreads->end()); 1369 int tid = *thread; |
1347 1348 if (fetchStatus[tid] == Running || 1349 fetchStatus[tid] == IcacheAccessComplete || 1350 fetchStatus[tid] == Idle) { 1351 return tid; 1352 } else { 1353 return -1; 1354 } --- 33 unchanged lines hidden (view full) --- 1388} 1389 1390template<class Impl> 1391int 1392DefaultFetch<Impl>::iqCount() 1393{ 1394 std::priority_queue<unsigned> PQ; 1395 | 1370 1371 if (fetchStatus[tid] == Running || 1372 fetchStatus[tid] == IcacheAccessComplete || 1373 fetchStatus[tid] == Idle) { 1374 return tid; 1375 } else { 1376 return -1; 1377 } --- 33 unchanged lines hidden (view full) --- 1411} 1412 1413template<class Impl> 1414int 1415DefaultFetch<Impl>::iqCount() 1416{ 1417 std::priority_queue<unsigned> PQ; 1418 |
1396 std::list<unsigned>::iterator threads = (*activeThreads).begin(); | 1419 std::list<unsigned>::iterator threads = activeThreads->begin(); 1420 std::list<unsigned>::iterator end = activeThreads->end(); |
1397 | 1421 |
1398 while (threads != (*activeThreads).end()) { | 1422 while (threads != end) { |
1399 unsigned tid = *threads++; 1400 1401 PQ.push(fromIEW->iewInfo[tid].iqCount); 1402 } 1403 1404 while (!PQ.empty()) { 1405 1406 unsigned high_pri = PQ.top(); --- 11 unchanged lines hidden (view full) --- 1418} 1419 1420template<class Impl> 1421int 1422DefaultFetch<Impl>::lsqCount() 1423{ 1424 std::priority_queue<unsigned> PQ; 1425 | 1423 unsigned tid = *threads++; 1424 1425 PQ.push(fromIEW->iewInfo[tid].iqCount); 1426 } 1427 1428 while (!PQ.empty()) { 1429 1430 unsigned high_pri = PQ.top(); --- 11 unchanged lines hidden (view full) --- 1442} 1443 1444template<class Impl> 1445int 1446DefaultFetch<Impl>::lsqCount() 1447{ 1448 std::priority_queue<unsigned> PQ; 1449 |
1450 std::list<unsigned>::iterator threads = activeThreads->begin(); 1451 std::list<unsigned>::iterator end = activeThreads->end(); |
|
1426 | 1452 |
1427 std::list<unsigned>::iterator threads = (*activeThreads).begin(); 1428 1429 while (threads != (*activeThreads).end()) { | 1453 while (threads != end) { |
1430 unsigned tid = *threads++; 1431 1432 PQ.push(fromIEW->iewInfo[tid].ldstqCount); 1433 } 1434 1435 while (!PQ.empty()) { 1436 1437 unsigned high_pri = PQ.top(); --- 9 unchanged lines hidden (view full) --- 1447 1448 return -1; 1449} 1450 1451template<class Impl> 1452int 1453DefaultFetch<Impl>::branchCount() 1454{ | 1454 unsigned tid = *threads++; 1455 1456 PQ.push(fromIEW->iewInfo[tid].ldstqCount); 1457 } 1458 1459 while (!PQ.empty()) { 1460 1461 unsigned high_pri = PQ.top(); --- 9 unchanged lines hidden (view full) --- 1471 1472 return -1; 1473} 1474 1475template<class Impl> 1476int 1477DefaultFetch<Impl>::branchCount() 1478{ |
1455 std::list<unsigned>::iterator threads = (*activeThreads).begin(); | 1479 std::list<unsigned>::iterator thread = activeThreads->begin(); 1480 assert(thread != activeThreads->end()); 1481 unsigned tid = *thread; 1482 |
1456 panic("Branch Count Fetch policy unimplemented\n"); | 1483 panic("Branch Count Fetch policy unimplemented\n"); |
1457 return *threads; | 1484 return 0 * tid; |
1458} | 1485} |