Mercurial > pygar
changeset 15:a1833d9f6e3d pygar svn.16
[svn r16] Recent
| author | punk |
|---|---|
| date | Tue, 27 Apr 2010 13:11:45 -0400 |
| parents | ec9205107560 |
| children | 7e1510b47336 |
| files | modules/bluespec/Pygar/core/AudioCoreRRR.cpp modules/bluespec/Pygar/core/AudioCoreRRR.cpp~ modules/bluespec/Pygar/core/Processor.bsv modules/bluespec/Pygar/core/Processor.bsv~ modules/bluespec/Pygar/core/audioCore.bsv modules/bluespec/Pygar/core/audioCore.bsv~ modules/bluespec/Pygar/core/audioCorePipeline.bsv modules/bluespec/Pygar/core/audioCorePipeline.bsv~ modules/bluespec/Pygar/core/audio_pipe_types.awb modules/bluespec/Pygar/core/audio_pipe_types.awb~ |
| diffstat | 10 files changed, 39 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
1.1 --- a/modules/bluespec/Pygar/core/AudioCoreRRR.cpp Tue Apr 27 09:13:34 2010 -0400 1.2 +++ b/modules/bluespec/Pygar/core/AudioCoreRRR.cpp Tue Apr 27 13:11:45 2010 -0400 1.3 @@ -18,7 +18,7 @@ 1.4 1.5 // constructor 1.6 AUDIOCORERRR_SERVER_CLASS::AUDIOCORERRR_SERVER_CLASS() : 1.7 - serverStub(new AUDICORERRR_SERVER_STUB_CLASS(this)) 1.8 + serverStub(new AUDIOCORERRR_SERVER_STUB_CLASS(this)) 1.9 { 1.10 // instantiate stub 1.11 printf("AUDIOCORERRR init called\n");
2.1 --- a/modules/bluespec/Pygar/core/AudioCoreRRR.cpp~ Tue Apr 27 09:13:34 2010 -0400 2.2 +++ b/modules/bluespec/Pygar/core/AudioCoreRRR.cpp~ Tue Apr 27 13:11:45 2010 -0400 2.3 @@ -28,7 +28,7 @@ 2.4 } 2.5 2.6 // destructor 2.7 -AUDIOCORERRR_SERVER_CLASS::~PROCESSORSYSTEMRRR_SERVER_CLASS() 2.8 +AUDIOCORERRR_SERVER_CLASS::~AUDIOCORERRR_SERVER_CLASS() 2.9 { 2.10 Cleanup(); 2.11 }
3.1 --- a/modules/bluespec/Pygar/core/Processor.bsv Tue Apr 27 09:13:34 2010 -0400 3.2 +++ b/modules/bluespec/Pygar/core/Processor.bsv Tue Apr 27 13:11:45 2010 -0400 3.3 @@ -48,7 +48,6 @@ 3.4 `include "asim/rrr/remote_server_stub_AUDIOCORERRR.bsh" 3.5 `include "asim/provides/common_services.bsh" 3.6 `include "asim/dict/STATS_PROCESSOR.bsh" 3.7 -`include "asim/provides/audio_pipe_types.bsh" 3.8 3.9 // Local includes. Look for the correspondingly named .awb files 3.10 // workspace/labs/src/mit-6.375/modules/bluespec/mit-6.375/common/ 3.11 @@ -75,14 +74,14 @@ 3.12 // interface CPUToHost tohost; 3.13 3.14 // Interface to Audio Pipeline 3.15 - interface AudioOut audioOut; 3.16 + interface Get#(AudioProcessorUnit) sampleOutput; 3.17 3.18 endinterface 3.19 3.20 //The full interface for this is as below in the common file for audioProcessorTypes.bsv 3.21 -interface AudioOut; 3.22 - interface Get#(AudioProcessorUnit) audioSampleOutput; 3.23 -endinterface 3.24 +//interface AudioOut; 3.25 +// interface Get#(AudioProcessorUnit) audioSampleOutput; 3.26 +//endinterface 3.27 3.28 //interface AudioIn; 3.29 // interface Put#(AudioProcessorUnit) audioSampleInput; 3.30 @@ -564,7 +563,7 @@ 3.31 rule handleCPUToHost; 3.32 let req <- server_stub.acceptRequest_ReadCPUToHost(); 3.33 case (req) 3.34 - 0: server_stub.sendResponse_ReadCPUToHost(cp0_tohost); 3.35 + 0: server_stub.sendResponse_ReadCPUToHost(cp0_tohost); 3.36 1: server_stub.sendResponse_ReadCPUToHost(pc); 3.37 2: server_stub.sendResponse_ReadCPUToHost(zeroExtend(pack(stage))); 3.38 endcase 3.39 @@ -619,8 +618,8 @@ 3.40 // endmethod 3.41 // endinterface 3.42 3.43 - interface AudioOut audio; 3.44 - interface audioSampleOutput = fifoToGet(outAudioFifo); 3.45 + interface Get sampleOutput; 3.46 + interface sampleOutput = fifoToGet(outAudioFifo); 3.47 endinterface 3.48 3.49
4.1 --- a/modules/bluespec/Pygar/core/Processor.bsv~ Tue Apr 27 09:13:34 2010 -0400 4.2 +++ b/modules/bluespec/Pygar/core/Processor.bsv~ Tue Apr 27 13:11:45 2010 -0400 4.3 @@ -45,7 +45,7 @@ 4.4 4.5 // Local includes 4.6 //`include "asim/provides/processor_library.bsh" (included above directly) 4.7 -`include "asim/rrr/remote_server_stub_PROCESSORSYSTEMRRR.bsh" 4.8 +`include "asim/rrr/remote_server_stub_AUDIOCORERRR.bsh" 4.9 `include "asim/provides/common_services.bsh" 4.10 `include "asim/dict/STATS_PROCESSOR.bsh" 4.11 `include "asim/provides/audio_pipe_types.bsh" 4.12 @@ -56,7 +56,7 @@ 4.13 // these includes. These files are specific to this audio processing 4.14 // pipeline 4.15 4.16 -`include "asim/provides/audio_processor_types.bsh" 4.17 +`include "asim/provides/audio_pipe_types.bsh" 4.18 4.19 //interface CPUToHost; 4.20 // method Bit#(32) cpuToHost(int req); 4.21 @@ -228,7 +228,7 @@ 4.22 //----------------------------------------------------------- 4.23 // Debug port 4.24 4.25 - ServerStub_PROCESSORSYSTEMRRR server_stub <- mkServerStub_PROCESSORSYSTEMRRR(); 4.26 + ServerStub_AUDIOCORERRR server_stub <- mkServerStub_AUDIOCORERRR(); 4.27 4.28 4.29 //-----------------------------------------------------------
5.1 --- a/modules/bluespec/Pygar/core/audioCore.bsv Tue Apr 27 09:13:34 2010 -0400 5.2 +++ b/modules/bluespec/Pygar/core/audioCore.bsv Tue Apr 27 13:11:45 2010 -0400 5.3 @@ -38,21 +38,18 @@ 5.4 `include "asim/provides/instruction_cache.bsh" 5.5 `include "asim/provides/data_cache.bsh" 5.6 `include "asim/provides/processor.bsh" 5.7 +`include "asim/provides/audio_pipe_types.bsh" 5.8 + 5.9 5.10 interface Core; 5.11 5.12 // Interface from core to main memory 5.13 interface Client#(MainMemReq,MainMemResp) mmem_client; 5.14 5.15 - interface AudioOut audio; 5.16 - 5.17 + interface Get#(AudioProcessorUnit) sampleOutput; 5.18 + 5.19 endinterface 5.20 5.21 -interface AudioOut; 5.22 - // interface Put#(AudioProcessorUnit) sampleInput; 5.23 - interface Get#(AudioProcessorUnit) sampleOutput; 5.24 -endinterface 5.25 - 5.26 module [CONNECTED_MODULE] mkCore( Core ); 5.27 5.28 // Instantiate the modules 5.29 @@ -74,7 +71,10 @@ 5.30 // Methods 5.31 5.32 interface mmem_client = marb.mmem_client; 5.33 - 5.34 - interface AudioOut audio = proc.audioOut; 5.35 + 5.36 + interface sampleOutput = proc.sampleOutput; 5.37 + // interface sampleOutput = proc.audioOut; 5.38 + // interface AudioOut audio = proc.audioOut; 5.39 + 5.40 5.41 endmodule
6.1 --- a/modules/bluespec/Pygar/core/audioCore.bsv~ Tue Apr 27 09:13:34 2010 -0400 6.2 +++ b/modules/bluespec/Pygar/core/audioCore.bsv~ Tue Apr 27 13:11:45 2010 -0400 6.3 @@ -44,13 +44,11 @@ 6.4 // Interface from core to main memory 6.5 interface Client#(MainMemReq,MainMemResp) mmem_client; 6.6 6.7 - interface CPUToHost tohost; 6.8 - 6.9 - interface AudioIn audio; 6.10 + interface AudioOut audio; 6.11 6.12 endinterface 6.13 6.14 -interface AudioIn; 6.15 +interface AudioOut; 6.16 // interface Put#(AudioProcessorUnit) sampleInput; 6.17 interface Get#(AudioProcessorUnit) sampleOutput; 6.18 endinterface 6.19 @@ -77,8 +75,6 @@ 6.20 6.21 interface mmem_client = marb.mmem_client; 6.22 6.23 - interface CPUToHost tohost = proc.tohost; 6.24 - 6.25 - interface AudioIn audio = proc.audioIn; 6.26 + interface AudioOut audio = proc.audioOut; 6.27 6.28 endmodule
7.1 --- a/modules/bluespec/Pygar/core/audioCorePipeline.bsv Tue Apr 27 09:13:34 2010 -0400 7.2 +++ b/modules/bluespec/Pygar/core/audioCorePipeline.bsv Tue Apr 27 13:11:45 2010 -0400 7.3 @@ -26,6 +26,7 @@ 7.4 import GetPut::*; 7.5 import ClientServer::*; 7.6 import FIFO::*; 7.7 +import SpecialFIFOs::*; 7.8 7.9 //AWB includes 7.10 `include "asim/provides/low_level_platform_interface.bsh" 7.11 @@ -35,9 +36,10 @@ 7.12 //Local includes 7.13 `include "asim/provides/audio_pipe_types.bsh" //provides Audio Pipeline interface 7.14 `include "asim/provides/core.bsh" 7.15 - 7.16 +`include "asim/provides/processor_library.bsh" 7.17 +`include "asim/provides/fpga_components.bsh" 7.18 `include "asim/rrr/remote_client_stub_AUDIOCORERRR.bsh" 7.19 -`include "asim/rrr/remote_server_stub_AUDIOCORERRR.bsh" 7.20 +//`include "asim/rrr/remote_server_stub_AUDIOCORERRR.bsh" 7.21 7.22 module [CONNECTED_MODULE] mkConnectedApplication (); 7.23 Core core <- mkCore; 7.24 @@ -46,7 +48,7 @@ 7.25 //External memory 7.26 // I'm not comfortable assuming that the memory subsystem is in order 7.27 // So I'll insert a completion buffer here. 7.28 - ClientStub_AUDICORERRR client_stub <- mkClientStub_AUDIOCORERRR(); 7.29 + ClientStub_AUDIOCORERRR client_stub <- mkClientStub_AUDIOCORERRR(); 7.30 // Make this big enough so that several outstanding requests may be supported 7.31 FIFO#(Bit#(MainMemTagSz)) tags <- mkSizedFIFO(8); 7.32 7.33 @@ -84,11 +86,11 @@ 7.34 AudioProcessorControl endOfFileTag = EndOfFile; 7.35 AudioProcessorControl sampleTag = Data; 7.36 7.37 - case (pipelineData) matches 7.38 - tagged EndOfFile: client_stub.makeRequest_SendProcessedStream(zeroExtend(pack(endOfFileTag)),?); 7.39 - tagged Sample .sample:client_stub.makeRequest_SendProcessedStream(zeroExtend(pack(sampleTag)), 7.40 - zeroExtend(pack(sample))); 7.41 - endcase 7.42 + // case (pipelineData) matches 7.43 + // tagged EndOfFile: 7.44 + client_stub.makeRequest_SendProcessedStream(zeroExtend(pack(endOfFileTag)),?); 7.45 +// tagged Sample .sample:client_stub.makeRequest_SendProcessedStream(zeroExtend(pack(sampleTag)), zeroExtend(pack(sample))); 7.46 +// endcase 7.47 endrule 7.48 7.49 endmodule
8.1 --- a/modules/bluespec/Pygar/core/audioCorePipeline.bsv~ Tue Apr 27 09:13:34 2010 -0400 8.2 +++ b/modules/bluespec/Pygar/core/audioCorePipeline.bsv~ Tue Apr 27 13:11:45 2010 -0400 8.3 @@ -33,7 +33,7 @@ 8.4 `include "asim/provides/common_services.bsh" 8.5 8.6 //Local includes 8.7 -`include "asim/provides/audio_processor_types.bsh" //provides Audio Pipeline interface 8.8 +`include "asim/provides/audio_pipe_types.bsh" //provides Audio Pipeline interface 8.9 `include "asim/provides/core.bsh" 8.10 8.11 `include "asim/rrr/remote_client_stub_AUDIOCORERRR.bsh" 8.12 @@ -46,7 +46,7 @@ 8.13 //External memory 8.14 // I'm not comfortable assuming that the memory subsystem is in order 8.15 // So I'll insert a completion buffer here. 8.16 - ClientStub_PROCESSORSYSTEMRRR client_stub <- mkClientStub_PROCESSORSYSTEMRRR(); 8.17 + ClientStub_AUDIOCORERRR client_stub <- mkClientStub_AUDIOCORERRR(); 8.18 // Make this big enough so that several outstanding requests may be supported 8.19 FIFO#(Bit#(MainMemTagSz)) tags <- mkSizedFIFO(8); 8.20
9.1 --- a/modules/bluespec/Pygar/core/audio_pipe_types.awb Tue Apr 27 09:13:34 2010 -0400 9.2 +++ b/modules/bluespec/Pygar/core/audio_pipe_types.awb Tue Apr 27 13:11:45 2010 -0400 9.3 @@ -1,10 +1,10 @@ 9.4 -i%name Simple Audio Processor Core 9.5 +%name Simple Audio Processor Control Types 9.6 %desc Instantiates a processor, some caches, and a memory arbiter 9.7 9.8 %provides audio_pipe_types 9.9 9.10 %attributes 6_375 9.11 9.12 -%public AudioPipeTypes.bsv 9.13 +%public audioPipeTypes.bsv 9.14 9.15
10.1 --- a/modules/bluespec/Pygar/core/audio_pipe_types.awb~ Tue Apr 27 09:13:34 2010 -0400 10.2 +++ b/modules/bluespec/Pygar/core/audio_pipe_types.awb~ Tue Apr 27 13:11:45 2010 -0400 10.3 @@ -3,14 +3,8 @@ 10.4 10.5 %provides audio_pipe_types 10.6 10.7 -%requires mem_arb 10.8 -%requires instruction_cache 10.9 -%requires data_cache 10.10 -%requires processor 10.11 -%requires processor_library 10.12 - 10.13 %attributes 6_375 10.14 10.15 -%public audioCore.bsv 10.16 +%public AudioPipeTypes.bsv 10.17 10.18