# HG changeset patch # User punk # Date 1272388305 14400 # Node ID a1833d9f6e3d18f3cbaca90ba9d071e7afe905d0 # Parent ec9205107560b28e34b36ba5f62126951a1a4c2f [svn r16] Recent diff -r ec9205107560 -r a1833d9f6e3d modules/bluespec/Pygar/core/AudioCoreRRR.cpp --- a/modules/bluespec/Pygar/core/AudioCoreRRR.cpp Tue Apr 27 09:13:34 2010 -0400 +++ b/modules/bluespec/Pygar/core/AudioCoreRRR.cpp Tue Apr 27 13:11:45 2010 -0400 @@ -18,7 +18,7 @@ // constructor AUDIOCORERRR_SERVER_CLASS::AUDIOCORERRR_SERVER_CLASS() : - serverStub(new AUDICORERRR_SERVER_STUB_CLASS(this)) + serverStub(new AUDIOCORERRR_SERVER_STUB_CLASS(this)) { // instantiate stub printf("AUDIOCORERRR init called\n"); diff -r ec9205107560 -r a1833d9f6e3d modules/bluespec/Pygar/core/AudioCoreRRR.cpp~ --- a/modules/bluespec/Pygar/core/AudioCoreRRR.cpp~ Tue Apr 27 09:13:34 2010 -0400 +++ b/modules/bluespec/Pygar/core/AudioCoreRRR.cpp~ Tue Apr 27 13:11:45 2010 -0400 @@ -28,7 +28,7 @@ } // destructor -AUDIOCORERRR_SERVER_CLASS::~PROCESSORSYSTEMRRR_SERVER_CLASS() +AUDIOCORERRR_SERVER_CLASS::~AUDIOCORERRR_SERVER_CLASS() { Cleanup(); } diff -r ec9205107560 -r a1833d9f6e3d modules/bluespec/Pygar/core/Processor.bsv --- a/modules/bluespec/Pygar/core/Processor.bsv Tue Apr 27 09:13:34 2010 -0400 +++ b/modules/bluespec/Pygar/core/Processor.bsv Tue Apr 27 13:11:45 2010 -0400 @@ -48,7 +48,6 @@ `include "asim/rrr/remote_server_stub_AUDIOCORERRR.bsh" `include "asim/provides/common_services.bsh" `include "asim/dict/STATS_PROCESSOR.bsh" -`include "asim/provides/audio_pipe_types.bsh" // Local includes. Look for the correspondingly named .awb files // workspace/labs/src/mit-6.375/modules/bluespec/mit-6.375/common/ @@ -75,14 +74,14 @@ // interface CPUToHost tohost; // Interface to Audio Pipeline - interface AudioOut audioOut; + interface Get#(AudioProcessorUnit) sampleOutput; endinterface //The full interface for this is as below in the common file for audioProcessorTypes.bsv -interface AudioOut; - interface Get#(AudioProcessorUnit) audioSampleOutput; -endinterface +//interface AudioOut; +// interface Get#(AudioProcessorUnit) audioSampleOutput; +//endinterface //interface AudioIn; // interface Put#(AudioProcessorUnit) audioSampleInput; @@ -564,7 +563,7 @@ rule handleCPUToHost; let req <- server_stub.acceptRequest_ReadCPUToHost(); case (req) - 0: server_stub.sendResponse_ReadCPUToHost(cp0_tohost); + 0: server_stub.sendResponse_ReadCPUToHost(cp0_tohost); 1: server_stub.sendResponse_ReadCPUToHost(pc); 2: server_stub.sendResponse_ReadCPUToHost(zeroExtend(pack(stage))); endcase @@ -619,8 +618,8 @@ // endmethod // endinterface - interface AudioOut audio; - interface audioSampleOutput = fifoToGet(outAudioFifo); + interface Get sampleOutput; + interface sampleOutput = fifoToGet(outAudioFifo); endinterface diff -r ec9205107560 -r a1833d9f6e3d modules/bluespec/Pygar/core/Processor.bsv~ --- a/modules/bluespec/Pygar/core/Processor.bsv~ Tue Apr 27 09:13:34 2010 -0400 +++ b/modules/bluespec/Pygar/core/Processor.bsv~ Tue Apr 27 13:11:45 2010 -0400 @@ -45,7 +45,7 @@ // Local includes //`include "asim/provides/processor_library.bsh" (included above directly) -`include "asim/rrr/remote_server_stub_PROCESSORSYSTEMRRR.bsh" +`include "asim/rrr/remote_server_stub_AUDIOCORERRR.bsh" `include "asim/provides/common_services.bsh" `include "asim/dict/STATS_PROCESSOR.bsh" `include "asim/provides/audio_pipe_types.bsh" @@ -56,7 +56,7 @@ // these includes. These files are specific to this audio processing // pipeline -`include "asim/provides/audio_processor_types.bsh" +`include "asim/provides/audio_pipe_types.bsh" //interface CPUToHost; // method Bit#(32) cpuToHost(int req); @@ -228,7 +228,7 @@ //----------------------------------------------------------- // Debug port - ServerStub_PROCESSORSYSTEMRRR server_stub <- mkServerStub_PROCESSORSYSTEMRRR(); + ServerStub_AUDIOCORERRR server_stub <- mkServerStub_AUDIOCORERRR(); //----------------------------------------------------------- diff -r ec9205107560 -r a1833d9f6e3d modules/bluespec/Pygar/core/audioCore.bsv --- a/modules/bluespec/Pygar/core/audioCore.bsv Tue Apr 27 09:13:34 2010 -0400 +++ b/modules/bluespec/Pygar/core/audioCore.bsv Tue Apr 27 13:11:45 2010 -0400 @@ -38,21 +38,18 @@ `include "asim/provides/instruction_cache.bsh" `include "asim/provides/data_cache.bsh" `include "asim/provides/processor.bsh" +`include "asim/provides/audio_pipe_types.bsh" + interface Core; // Interface from core to main memory interface Client#(MainMemReq,MainMemResp) mmem_client; - interface AudioOut audio; - + interface Get#(AudioProcessorUnit) sampleOutput; + endinterface -interface AudioOut; - // interface Put#(AudioProcessorUnit) sampleInput; - interface Get#(AudioProcessorUnit) sampleOutput; -endinterface - module [CONNECTED_MODULE] mkCore( Core ); // Instantiate the modules @@ -74,7 +71,10 @@ // Methods interface mmem_client = marb.mmem_client; - - interface AudioOut audio = proc.audioOut; + + interface sampleOutput = proc.sampleOutput; + // interface sampleOutput = proc.audioOut; + // interface AudioOut audio = proc.audioOut; + endmodule diff -r ec9205107560 -r a1833d9f6e3d modules/bluespec/Pygar/core/audioCore.bsv~ --- a/modules/bluespec/Pygar/core/audioCore.bsv~ Tue Apr 27 09:13:34 2010 -0400 +++ b/modules/bluespec/Pygar/core/audioCore.bsv~ Tue Apr 27 13:11:45 2010 -0400 @@ -44,13 +44,11 @@ // Interface from core to main memory interface Client#(MainMemReq,MainMemResp) mmem_client; - interface CPUToHost tohost; - - interface AudioIn audio; + interface AudioOut audio; endinterface -interface AudioIn; +interface AudioOut; // interface Put#(AudioProcessorUnit) sampleInput; interface Get#(AudioProcessorUnit) sampleOutput; endinterface @@ -77,8 +75,6 @@ interface mmem_client = marb.mmem_client; - interface CPUToHost tohost = proc.tohost; - - interface AudioIn audio = proc.audioIn; + interface AudioOut audio = proc.audioOut; endmodule diff -r ec9205107560 -r a1833d9f6e3d modules/bluespec/Pygar/core/audioCorePipeline.bsv --- a/modules/bluespec/Pygar/core/audioCorePipeline.bsv Tue Apr 27 09:13:34 2010 -0400 +++ b/modules/bluespec/Pygar/core/audioCorePipeline.bsv Tue Apr 27 13:11:45 2010 -0400 @@ -26,6 +26,7 @@ import GetPut::*; import ClientServer::*; import FIFO::*; +import SpecialFIFOs::*; //AWB includes `include "asim/provides/low_level_platform_interface.bsh" @@ -35,9 +36,10 @@ //Local includes `include "asim/provides/audio_pipe_types.bsh" //provides Audio Pipeline interface `include "asim/provides/core.bsh" - +`include "asim/provides/processor_library.bsh" +`include "asim/provides/fpga_components.bsh" `include "asim/rrr/remote_client_stub_AUDIOCORERRR.bsh" -`include "asim/rrr/remote_server_stub_AUDIOCORERRR.bsh" +//`include "asim/rrr/remote_server_stub_AUDIOCORERRR.bsh" module [CONNECTED_MODULE] mkConnectedApplication (); Core core <- mkCore; @@ -46,7 +48,7 @@ //External memory // I'm not comfortable assuming that the memory subsystem is in order // So I'll insert a completion buffer here. - ClientStub_AUDICORERRR client_stub <- mkClientStub_AUDIOCORERRR(); + ClientStub_AUDIOCORERRR client_stub <- mkClientStub_AUDIOCORERRR(); // Make this big enough so that several outstanding requests may be supported FIFO#(Bit#(MainMemTagSz)) tags <- mkSizedFIFO(8); @@ -84,11 +86,11 @@ AudioProcessorControl endOfFileTag = EndOfFile; AudioProcessorControl sampleTag = Data; - case (pipelineData) matches - tagged EndOfFile: client_stub.makeRequest_SendProcessedStream(zeroExtend(pack(endOfFileTag)),?); - tagged Sample .sample:client_stub.makeRequest_SendProcessedStream(zeroExtend(pack(sampleTag)), - zeroExtend(pack(sample))); - endcase + // case (pipelineData) matches + // tagged EndOfFile: + client_stub.makeRequest_SendProcessedStream(zeroExtend(pack(endOfFileTag)),?); +// tagged Sample .sample:client_stub.makeRequest_SendProcessedStream(zeroExtend(pack(sampleTag)), zeroExtend(pack(sample))); +// endcase endrule endmodule diff -r ec9205107560 -r a1833d9f6e3d modules/bluespec/Pygar/core/audioCorePipeline.bsv~ --- a/modules/bluespec/Pygar/core/audioCorePipeline.bsv~ Tue Apr 27 09:13:34 2010 -0400 +++ b/modules/bluespec/Pygar/core/audioCorePipeline.bsv~ Tue Apr 27 13:11:45 2010 -0400 @@ -33,7 +33,7 @@ `include "asim/provides/common_services.bsh" //Local includes -`include "asim/provides/audio_processor_types.bsh" //provides Audio Pipeline interface +`include "asim/provides/audio_pipe_types.bsh" //provides Audio Pipeline interface `include "asim/provides/core.bsh" `include "asim/rrr/remote_client_stub_AUDIOCORERRR.bsh" @@ -46,7 +46,7 @@ //External memory // I'm not comfortable assuming that the memory subsystem is in order // So I'll insert a completion buffer here. - ClientStub_PROCESSORSYSTEMRRR client_stub <- mkClientStub_PROCESSORSYSTEMRRR(); + ClientStub_AUDIOCORERRR client_stub <- mkClientStub_AUDIOCORERRR(); // Make this big enough so that several outstanding requests may be supported FIFO#(Bit#(MainMemTagSz)) tags <- mkSizedFIFO(8); diff -r ec9205107560 -r a1833d9f6e3d modules/bluespec/Pygar/core/audio_pipe_types.awb --- a/modules/bluespec/Pygar/core/audio_pipe_types.awb Tue Apr 27 09:13:34 2010 -0400 +++ b/modules/bluespec/Pygar/core/audio_pipe_types.awb Tue Apr 27 13:11:45 2010 -0400 @@ -1,10 +1,10 @@ -i%name Simple Audio Processor Core +%name Simple Audio Processor Control Types %desc Instantiates a processor, some caches, and a memory arbiter %provides audio_pipe_types %attributes 6_375 -%public AudioPipeTypes.bsv +%public audioPipeTypes.bsv diff -r ec9205107560 -r a1833d9f6e3d modules/bluespec/Pygar/core/audio_pipe_types.awb~ --- a/modules/bluespec/Pygar/core/audio_pipe_types.awb~ Tue Apr 27 09:13:34 2010 -0400 +++ b/modules/bluespec/Pygar/core/audio_pipe_types.awb~ Tue Apr 27 13:11:45 2010 -0400 @@ -3,14 +3,8 @@ %provides audio_pipe_types -%requires mem_arb -%requires instruction_cache -%requires data_cache -%requires processor -%requires processor_library - %attributes 6_375 -%public audioCore.bsv +%public AudioPipeTypes.bsv