Ignore:
Timestamp:
Feb 3, 2017, 1:25:53 PM (2 years ago)
Author:
nmedfort
Message:

Partial removal of BlockNo?

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/kernels/kernel.h

    r5292 r5297  
    5050    void setTerminationSignal(llvm::Value * instance) const override final;
    5151
    52     llvm::Value * getScalarFieldPtr(llvm::Value * instance, const std::string & name) const;
    53 
    54     llvm::Value * getScalarFieldPtr(llvm::Value *instance, llvm::Value * index) const;
    55 
    56     llvm::Value * getStreamSetBufferPtr(llvm::Value * instance, const std::string & name) const;
    57 
    58     llvm::Value * getStreamSetBufferPtr(llvm::Value * instance, llvm::Value * index) const;
    59    
    6052    // Get the value of a scalar field for a given instance.
    6153    llvm::Value * getScalarField(llvm::Value * instance, const std::string & fieldName) const;
     
    180172    }
    181173
    182     llvm::Value * getStream(const std::string & name, llvm::Value * blockNo, llvm::Value * index) const;
    183 
    184     llvm::Value * getStream(const std::string & name, llvm::Value * blockNo, llvm::Value * index1, llvm::Value * index2) const;
    185 
    186     llvm::Value * getStreamView(const std::string & name, llvm::Value * blockNo, llvm::Value * index) const;
     174    llvm::Value * getInputStream(const std::string & name, llvm::Value * index) const;
     175
     176    llvm::Value * getInputStream(const std::string & name, llvm::Value * index1, llvm::Value * index2) const;
     177
     178    llvm::Value * getOutputStream(const std::string & name, llvm::Value * index) const;
     179
     180    llvm::Value * getOutputStream(const std::string & name, llvm::Value * index1, llvm::Value * index2) const;
    187181
    188182    llvm::Value * getStreamView(llvm::Type * type, const std::string & name, llvm::Value * blockNo, llvm::Value * index) const;
    189183
    190     // Stream set helpers.
     184
    191185    llvm::Value * getScalarFieldPtr(const std::string & name) const {
    192186        return getScalarFieldPtr(getSelf(), name);
     
    197191    }
    198192
    199     llvm::Value * getStreamSetBufferPtr(const std::string & name) const {
    200         return getStreamSetBufferPtr(getSelf(), name);
    201     }
    202 
    203     llvm::Value * getStreamSetBufferPtr(llvm::Value * index) const {
    204         return getStreamSetBufferPtr(getSelf(), index);
    205     }
    206 
    207193    llvm::Value * getStreamSetPtr(const std::string & name, llvm::Value * blockNo) const;
    208194
     
    239225
    240226private:
     227
     228    // Stream set helpers.
     229//    llvm::Value * getStream(const std::string & name, llvm::Value * blockNo, llvm::Value * index) const;
     230
     231//    llvm::Value * getStream(const std::string & name, llvm::Value * blockNo, llvm::Value * index1, llvm::Value * index2) const;
     232
     233    llvm::Value * getStreamSetBufferPtr(const std::string & name) const;
     234
     235    llvm::Value * getStreamSetBufferPtr(llvm::Value * index) const;
     236
     237    llvm::Value * getScalarFieldPtr(llvm::Value * instance, const std::string & name) const;
     238
     239    llvm::Value * getScalarFieldPtr(llvm::Value * instance, llvm::Value * index) const;
    241240
    242241    unsigned getStreamSetIndex(const std::string & name) const;
     
    291290    // Each kernel builder subtype must provide its own logic for generating
    292291    // doBlock calls.
    293     virtual void generateDoBlockMethod(llvm::Value * blockNo) = 0;
     292    virtual void generateDoBlockMethod() = 0;
    294293
    295294    // Each kernel builder subtypre must also specify the logic for processing the
     
    300299    // not be overridden.
    301300
    302     virtual void generateFinalBlockMethod(llvm::Value * remainingBytes, llvm::Value * blockNo);
     301    virtual void generateFinalBlockMethod(llvm::Value * remainingBytes);
    303302
    304303    virtual void generateDoSegmentMethod(llvm::Value * doFinal, const std::vector<llvm::Value *> & producerPos) final;
Note: See TracChangeset for help on using the changeset viewer.