sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

SLICC: Remove external_type for structures

Browse source 
In SLICC, in order to define a type a data type for which it should not
generate any code, the keyword external_type is used. For those data types for
which code should be generated, the keyword structure is used. This patch
eliminates the use of keyword external_type for defining structures. structure
key word can now have an optional attribute external, which would be used for
figuring out whether or not to generate the code for this structure. Also, now
structures can have functions as well data members in them.
This commit is contained in:
Nilay Vaish 2011-03-18 14:12:04 -05:00
parent 3f27ccbb54
commit 18142df5b9
19 changed files with 38 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mem/protocol/MESI_CMP_directory-L1cache.sm
View file

@ -119,7 +119,7 @@ machine(L1Cache, "MSI Directory L1 Cache CMP")
int pendingAcks, default="0", desc="number of pending acks";
}
external_type(TBETable) {
structure(TBETable, external="yes") {
TBE lookup(Address);
void allocate(Address);
void deallocate(Address);

2
src/mem/protocol/MESI_CMP_directory-L2cache.sm
View file

@ -145,7 +145,7 @@ machine(L2Cache, "MESI Directory L2 Cache CMP")
int pendingAcks, desc="number of pending acks for invalidates during writeback";
}
external_type(TBETable) {
structure(TBETable, external="yes") {
TBE lookup(Address);
void allocate(Address);
void deallocate(Address);

2
src/mem/protocol/MESI_CMP_directory-dir.sm
View file

@ -95,7 +95,7 @@ machine(Directory, "MESI_CMP_filter_directory protocol")
int Len, desc="...";
}
external_type(TBETable) {
structure(TBETable, external="yes") {
TBE lookup(Address);
void allocate(Address);
void deallocate(Address);

2
src/mem/protocol/MESI_CMP_directory-dma.sm
View file

@ -20,7 +20,7 @@ machine(DMA, "DMA Controller")
Ack, desc="DMA write to memory completed";
}
external_type(DMASequencer) {
structure(DMASequencer, external="yes") {
void ackCallback();
void dataCallback(DataBlock);
}

2
src/mem/protocol/MI_example-cache.sm
View file

@ -61,7 +61,7 @@ machine(L1Cache, "MI Example L1 Cache")
DataBlock DataBlk, desc="data for the block, required for concurrent writebacks";
}
external_type(TBETable) {
structure(TBETable, external="yes") {
TBE lookup(Address);
void allocate(Address);
void deallocate(Address);

2
src/mem/protocol/MI_example-dir.sm
View file

@ -66,7 +66,7 @@ machine(Directory, "Directory protocol")
MachineID DmaRequestor, desc="DMA requestor";
}
external_type(TBETable) {
structure(TBETable, external="yes") {
TBE lookup(Address);
void allocate(Address);
void deallocate(Address);

2
src/mem/protocol/MOESI_CMP_directory-L1cache.sm
View file

@ -127,7 +127,7 @@ machine(L1Cache, "Directory protocol")
int NumPendingMsgs, default="0", desc="Number of acks/data messages that this processor is waiting for";
}
external_type(TBETable) {
structure(TBETable, external ="yes") {
TBE lookup(Address);
void allocate(Address);
void deallocate(Address);

4
src/mem/protocol/MOESI_CMP_directory-L2cache.sm
View file

@ -203,14 +203,14 @@ machine(L2Cache, "Token protocol")
MachineID Fwd_GetX_ID, desc="ID of the L1 cache to forward the block to once we get a response";
}
external_type(TBETable) {
structure(TBETable, external = "yes") {
TBE lookup(Address);
void allocate(Address);
void deallocate(Address);
bool isPresent(Address);
}
external_type(PerfectCacheMemory) {
structure(PerfectCacheMemory, external = "yes") {
void allocate(Address);
void deallocate(Address);
DirEntry lookup(Address);

2
src/mem/protocol/MOESI_CMP_directory-dir.sm
View file

@ -109,7 +109,7 @@ machine(Directory, "Directory protocol")
MachineID Requestor, desc="original requestor";
}
external_type(TBETable) {
structure(TBETable, external = "yes") {
TBE lookup(Address);
void allocate(Address);
void deallocate(Address);

4
src/mem/protocol/MOESI_CMP_directory-dma.sm
View file

@ -34,12 +34,12 @@ machine(DMA, "DMA Controller")
DataBlock DataBlk, desc="Data";
}
external_type(DMASequencer) {
structure(DMASequencer, external = "yes") {
void ackCallback();
void dataCallback(DataBlock);
}
external_type(TBETable) {
structure(TBETable, external = "yes") {
TBE lookup(Address);
void allocate(Address);
void deallocate(Address);

4
src/mem/protocol/MOESI_CMP_token-L1cache.sm
View file

@ -153,14 +153,14 @@ machine(L1Cache, "Token protocol")
PrefetchBit Prefetch, desc="Is this a prefetch request";
}
external_type(TBETable) {
structure(TBETable, external="yes") {
TBE lookup(Address);
void allocate(Address);
void deallocate(Address);
bool isPresent(Address);
}
external_type(PersistentTable) {
structure(PersistentTable, external="yes") {
void persistentRequestLock(Address, MachineID, AccessType);
void persistentRequestUnlock(Address, MachineID);
bool okToIssueStarving(Address, MachineID);

4
src/mem/protocol/MOESI_CMP_token-L2cache.sm
View file

@ -127,14 +127,14 @@ machine(L2Cache, "Token protocol")
bool exclusive, default="false", desc="if local exclusive is likely";
}
external_type(PerfectCacheMemory) {
structure(PerfectCacheMemory, external="yes") {
void allocate(Address);
void deallocate(Address);
DirEntry lookup(Address);
bool isTagPresent(Address);
}
external_type(PersistentTable) {
structure(PersistentTable, external="yes") {
void persistentRequestLock(Address, MachineID, AccessType);
void persistentRequestUnlock(Address, MachineID);
MachineID findSmallest(Address);

4
src/mem/protocol/MOESI_CMP_token-dir.sm
View file

@ -122,7 +122,7 @@ machine(Directory, "Token protocol")
Set Sharers, desc="Probable sharers of the line. More accurately, the set of processors who need to see a GetX";
}
external_type(PersistentTable) {
structure(PersistentTable, external="yes") {
void persistentRequestLock(Address, MachineID, AccessType);
void persistentRequestUnlock(Address, MachineID);
bool okToIssueStarving(Address, MachineID);
@ -145,7 +145,7 @@ machine(Directory, "Token protocol")
bool WentPersistent, desc="Did the DMA request require a persistent request";
}
external_type(TBETable) {
structure(TBETable, external="yes") {
TBE lookup(Address);
void allocate(Address);
void deallocate(Address);

2
src/mem/protocol/MOESI_CMP_token-dma.sm
View file

@ -48,7 +48,7 @@ machine(DMA, "DMA Controller")
Ack, desc="DMA write to memory completed";
}
external_type(DMASequencer) {
structure(DMASequencer, external="yes") {
void ackCallback();
void dataCallback(DataBlock);
}

2
src/mem/protocol/MOESI_hammer-cache.sm
View file

@ -145,7 +145,7 @@ machine(L1Cache, "AMD Hammer-like protocol")
Time FirstResponseTime, default="0", desc="the time the first response was received";
}
external_type(TBETable) {
structure(TBETable, external="yes") {
TBE lookup(Address);
void allocate(Address);
void deallocate(Address);

2
src/mem/protocol/MOESI_hammer-dir.sm
View file

@ -162,7 +162,7 @@ machine(Directory, "AMD Hammer-like protocol")
bool Owned, default="false", desc="Indicates whether a cache has indicated it is currently a sharer";
}
external_type(TBETable) {
structure(TBETable, external="yes") {
TBE lookup(Address);
void allocate(Address);
void deallocate(Address);

2
src/mem/protocol/RubySlicc_Exports.sm
View file

@ -39,7 +39,7 @@ external_type(std::string, primitive="yes");
external_type(uint64, primitive="yes");
external_type(Time, primitive="yes", default="0");
external_type(Address);
external_type(DataBlock, desc="..."){
structure(DataBlock, external = "yes", desc="..."){
void clear();
void copyPartial(DataBlock, int, int);
}

25
src/mem/protocol/RubySlicc_Types.sm
View file

@ -40,7 +40,7 @@ external_type(MessageBuffer, buffer="yes", inport="yes", outport="yes");
external_type(OutPort, primitive="yes");
external_type(InPort, primitive="yes") {
structure(InPort, external = "yes", primitive="yes") {
bool isReady();
void dequeue();
int dequeue_getDelayCycles();
@ -53,7 +53,7 @@ external_type(MachineID);
MessageBuffer getMandatoryQueue(int core_id);
external_type(Set, non_obj="yes") {
structure (Set, external = "yes", non_obj="yes") {
void setSize(int);
void add(NodeID);
void addSet(Set);
@ -70,7 +70,7 @@ external_type(Set, non_obj="yes") {
NodeID smallestElement();
}
external_type(NetDest, non_obj="yes") {
structure (NetDest, external = "yes", non_obj="yes") {
void setSize(int);
void setSize(int, int);
void add(NodeID);
@ -98,7 +98,7 @@ external_type(NetDest, non_obj="yes") {
MachineID smallestElement(MachineType);
}
external_type(Sequencer) {
structure (Sequencer, external = "yes") {
void readCallback(Address, DataBlock);
void readCallback(Address, GenericMachineType, DataBlock);
void readCallback(Address, GenericMachineType, DataBlock, Time, Time, Time);
@ -111,7 +111,7 @@ external_type(Sequencer) {
external_type(AbstractEntry, primitive="yes");
external_type(DirectoryMemory) {
structure (DirectoryMemory, external = "yes") {
AbstractEntry lookup(Address);
bool isPresent(Address);
void invalidateBlock(Address);
@ -119,7 +119,7 @@ external_type(DirectoryMemory) {
external_type(AbstractCacheEntry, primitive="yes");
external_type(CacheMemory) {
structure (CacheMemory, external = "yes") {
bool cacheAvail(Address);
Address cacheProbe(Address);
AbstractCacheEntry allocate(Address, AbstractCacheEntry);
@ -135,16 +135,16 @@ external_type(CacheMemory) {
void setMRU(Address);
}
external_type(MemoryControl, inport="yes", outport="yes") {
structure (MemoryControl, inport="yes", outport="yes", external = "yes") {
}
external_type(DMASequencer) {
structure (DMASequencer, external = "yes") {
void ackCallback();
void dataCallback(DataBlock);
}
external_type(TimerTable, inport="yes") {
structure (TimerTable, inport="yes", external = "yes") {
bool isReady();
Address readyAddress();
void set(Address, int);
@ -152,8 +152,7 @@ external_type(TimerTable, inport="yes") {
bool isSet(Address);
}
external_type(GenericBloomFilter) {
structure (GenericBloomFilter, external = "yes") {
void clear(int);
void increment(Address, int);
void decrement(Address, int);
@ -163,7 +162,3 @@ external_type(GenericBloomFilter) {
bool isSet(Address, int);
int getCount(Address, int);
}

26
src/mem/slicc/parser.py
View file

@ -309,11 +309,6 @@ class SLICC(Grammar):
p[4]["external"] = "yes"
p[0] = ast.TypeDeclAST(self, p[3], p[4], [])
def p_decl__extern1(self, p):
"decl : EXTERN_TYPE '(' type pairs ')' '{' type_methods '}'"
p[4]["external"] = "yes"
p[0] = ast.TypeDeclAST(self, p[3], p[4], p[7])
def p_decl__global(self, p):
"decl : GLOBAL '(' type pairs ')' '{' type_members '}'"
p[4]["global"] = "yes"
@ -357,28 +352,19 @@ class SLICC(Grammar):
"type_members : empty"
p[0] = []
def p_type_method__0(self, p):
"type_member : type_or_void ident '(' types ')' pairs SEMI"
p[0] = ast.TypeFieldMethodAST(self, p[1], p[2], p[4], p[6])
def p_type_member__1(self, p):
"type_member : type ident pairs SEMI"
"type_member : type_or_void ident pairs SEMI"
p[0] = ast.TypeFieldMemberAST(self, p[1], p[2], p[3], None)
def p_type_member__2(self, p):
"type_member : type ident ASSIGN expr SEMI"
"type_member : type_or_void ident ASSIGN expr SEMI"
p[0] = ast.TypeFieldMemberAST(self, p[1], p[2],
ast.PairListAST(self), p[4])
# Methods
def p_type_methods__list(self, p):
"type_methods : type_method type_methods"
p[0] = [ p[1] ] + p[2]
def p_type_methods(self, p):
"type_methods : empty"
p[0] = []
def p_type_method(self, p):
"type_method : type_or_void ident '(' types ')' pairs SEMI"
p[0] = ast.TypeFieldMethodAST(self, p[1], p[2], p[4], p[6])
# Enum fields
def p_type_enums__list(self, p):
"type_enums : type_enum type_enums"