table printing pending

Author: damanBirSingh

Diff for: Makefile

@@ -1,7 +1,7 @@
 CXX = g++
 CXXFLAGS = 
 EXEC = cache
-OBJS = cache.o direct_mapped.o fully_associative_lru.o set_associative_lru.o set_associative_fifo.o
+OBJS = cache.o direct_mapped.o fully_associative_lru.o set_associative_lru.o set_associative_fifo.o fully_associative_fifo.o
 
 ${EXEC}: ${OBJS}
 	${CXX} ${CXXFLAGS} -o ${EXEC} ${OBJS}
@@ -19,5 +19,7 @@ set_associative_lru.o: set_associative_lru.cpp cache.hpp
 
 set_associative_fifo.o: set_associative_fifo.cpp cache.hpp
 
+fully_associative_fifo.o: fully_associative_fifo.cpp cache.hpp
+
 clean:
 	rm -f ${EXEC} ${OBJS}

Diff for: cache.cpp

@@ -23,14 +23,21 @@ void cache_impl::set_cache_parameters(int cache_size, int block_size, int set_wa
     block_offset_bits = log2(block_size*4);
     if(set_ways != 0){
         num_sets = num_lines/set_ways;
+        cout<<"num sets :"<<num_sets<<endl;
         set_associative_cache_FIFO = vector<deque<cache>>(num_sets, deque<cache>(set_ways*block_size, cache(0,0,"")));
     }
 }
 
 string decimal_to_hex_string(int decimal_value){
     stringstream ss;
     ss<< std::hex << decimal_value;
-    return ss.str();
+    string hex_string ="";
+    for(int i=0; i<4; i++){
+        if(decimal_value <= 15)
+        hex_string += "0";
+        hex_string += ss.str();
+    }
+    return hex_string+" ";
 }
 
 void cache_impl::call_appropriate_cache(int addr){
@@ -41,7 +48,7 @@ void cache_impl::call_appropriate_cache(int addr){
         }
         case fully_associative:{
             if(repl_algo == FIFO)
-                retrieve_value_from_fully_associative_cache_LRU(addr);
+                retrieve_value_from_fully_associative_cache_FIFO(addr);
             else
                 retrieve_value_from_fully_associative_cache_LRU(addr);
             break;
@@ -73,16 +80,13 @@ void cache_impl::print_appropriate_cache_state(){
             if(repl_algo == FIFO){
 
             }else{
-                for(int i=0; i<num_lines; i++){
-                    map<int, cache>::iterator it;
-                    if( (fully_associative_cache.find(i) != fully_associative_cache.end())){
-                        for(cache val: set_associative_cache[i]){
-                            cout<<i<<"\t\t"<<val.validBit<<"\t\t"<<val.tag<<"\t"<<val.data<<endl;
-                        }
-                    } else 
-                        cout<<i<<endl;
+                int k = 0;
+                for(auto val: fully_associative_cache){
+                    cout<<k++<<"\t\t"<<val.second.validBit<<"\t\t"<<val.second.tag<<"\t"<<val.second.data<<endl;
                 }
-            }
+            } 
+    
+            
 
             break;
         }
@@ -120,81 +124,30 @@ int main(){
     cout<<"Select Cache type: \n\n1.Direct Mapped\n2.Fully Associative\n3.Set Associative\n-->";
     cin>>temp;
     ch.c_type = (cache_type)temp;
+    ch.set_ways = 0;
     if(ch.c_type != direct_mapped){
         cout<<"Select Replacement Algorithm\n1.FIFO\n2.LRU\n-->";
         cin>>temp;
         ch.repl_algo = (replacement_algo)temp;
     }
     if(ch.c_type == set_associative){
         cout<<"Enter the number of Ways\n-->";
-        cin>>temp;
-        ch.set_ways = (cache_type)temp;
+        cin>>ch.set_ways;
     }
     ch.set_cache_parameters(ch.cache_size, ch.block_size, ch.set_ways);
     int i =  0;
+    ch.ind = 0;
     while(i< ch.address.size())
         ch.call_appropriate_cache(ch.address[i++]);
 
     ch.hit = 0; ch.miss=0; //reset after first iteration
 
-    for(int j= 1; j<400; j++){
+    for(int j= 1; j<2; j++){
         i=0;
         while(i< ch.address.size())
             ch.call_appropriate_cache(ch.address[i++]);
     }
     ch.print_appropriate_cache_state();
     cout<<"Hits: "<<ch.hit<<" Misses :"<<ch.miss<<endl;
-
-    /*ch.hit = 0; ch.miss=0;
-    cout<<"\n\nLRU Set Associative Cache\n";
-    ch.set_cache_parameters(16, 1, 2);
-    cout<<"Cache Size: 16 words, Block size : 1 word & 2 way set"<<endl;
-    i=0;
-    while(i< ch.address.size()){
-        //cout<<ch.address[i]<<endl;
-        ch.retrieve_value_from_set_associative_cache_LRU(ch.address[i++]);
-    } 
-    ch.hit = 0; ch.miss=0;
-    i=0;
-    while(i< ch.address.size()){
-        //cout<<ch.address[i]<<endl;
-        ch.retrieve_value_from_set_associative_cache_LRU(ch.address[i++]);
-    }
-    cout<<"Set Number\tvalidBit\tTag\tdata"<<endl;
-    for(int i=0; i<ch.num_sets; i++){
-        if( (ch.set_associative_cache.find(i) != ch.set_associative_cache.end())){
-            for(cache val: ch.set_associative_cache[i]){
-                cout<<i<<"\t\t"<<val.validBit<<"\t\t"<<val.tag<<"\t"<<val.data<<endl;
-            }
-        } else 
-            cout<<i<<endl;
-    }
-    cout<<"Hits: "<<ch.hit<<" misses "<<ch.miss<<endl;
-
-    ch.hit = 0; ch.miss=0;
-    cout<<"\n\nLRU Fully Associative Cache\n";
-    ch.set_cache_parameters(16, 2, 0);
-    cout<<"Cache Size: 16 words, Block size : 1 word "<<endl;
-    i=0;
-    while(i< ch.address.size()){
-        //cout<<ch.address[i]<<endl;
-        ch.retrieve_value_from_fully_associative_cache_LRU(ch.address[i++]);
-    } 
-    ch.hit = 0; ch.miss=0;
-    i=0;
-    while(i< ch.address.size()){
-        //cout<<ch.address[i]<<endl;
-        ch.retrieve_value_from_fully_associative_cache_LRU(ch.address[i++]);
-    }
 
-    /*cout<<"Set Number\tvalidBit\tTag\tdata"<<endl;
-    for(int i=0; i<ch.num_sets; i++){
-        if( (ch.fully_associative_cache.find(i) != ch.fully_associative_cache.end())){
-            for(cache val: ch.set_associative_cache[i]){
-                cout<<i<<"\t\t"<<val.validBit<<"\t\t"<<val.tag<<"\t"<<val.data<<endl;
-            }
-        } else 
-            cout<<i<<endl;
-    }*/
-    //cout<<"Hits: "<<ch.hit<<" misses "<<ch.miss<<endl;
 }

Diff for: cache.hpp

@@ -10,7 +10,7 @@ enum cache_type {direct_mapped = 1, fully_associative = 2, set_associative = 3};
 string decimal_to_hex_string(int);
 
 struct cache{
-    int validBit;
+    bool validBit;
     int tag;
     string data;
 
@@ -27,6 +27,7 @@ class cache_impl{
     int cache_size; //in words
     int num_lines;
     int block_offset_bits;
+    int word_size = 4;
     cache_type c_type;
     replacement_algo repl_algo;
 
@@ -40,6 +41,10 @@ class cache_impl{
     vector<deque<cache>> set_associative_cache_FIFO;
 
     map<int, cache> fully_associative_cache; // map<tag, cache>
+    int ind;
+
+    deque<cache> fully_associative_cache_fifo;
+
     list<int> fa_keys;
 
     int miss = 0, hit = 0;
@@ -49,7 +54,7 @@ class cache_impl{
     void retrieve_value_from_set_associative_cache_LRU(int);
     void retrieve_value_from_set_associative_cache_FIFO(int);
     void retrieve_value_from_fully_associative_cache_LRU(int);
-    //void retrieve_value_from_fully_associative_cache_FIFO(int);
+    void retrieve_value_from_fully_associative_cache_FIFO(int);
     void call_appropriate_cache(int);
     void print_appropriate_cache_state();
     ~cache_impl();

Diff for: direct_mapped.cpp

@@ -3,7 +3,7 @@
 void add_block_to_cache(map<int, cache> &, int, int, int, int);
 
 void cache_impl::retrieve_value_from_direct_cache(int address){
-    cout<<"Cache Size "<<cache_size<<" BLock Size "<<block_size<<endl;
+    //cout<<"Cache Size "<<cache_size<<" BLock Size "<<block_size<<endl;
     int mem_tag, mem_line, mem_block_offset;
 
     int line_bits = log2(num_lines);
@@ -18,19 +18,16 @@ void cache_impl::retrieve_value_from_direct_cache(int address){
     if( (direct_cache.find(mem_line) != direct_cache.end()) && //address wrt line
         ((direct_cache.find(mem_line)->second).tag == mem_tag) ) { // in that line, compare tag
         hit++;
-        cout<<"Is a Hit\n";
+        //cout<<"Is a Hit\n";
     } else {
-        cout<<"Is a Miss\n";
+        //cout<<"Is a Miss\n";
         miss++;
         add_block_to_cache(direct_cache, mem_tag, mem_line, address, block_size);
     }
 
 }
 
 void add_block_to_cache(map<int, cache> &direct_cache, int tag, int line, int address, int block_size){
-   
-    //block.tag = tag;
-    //block.validBit = 1;
     string data = decimal_to_hex_string(address);
     if(block_size==2)
         data += " " + decimal_to_hex_string(address + 4);