Changeset 5036 for icGREP


Ignore:
Timestamp:
May 9, 2016, 9:51:56 AM (3 years ago)
Author:
cameron
Message:

Include codegen options in -help

Location:
icGREP/icgrep-devel/icgrep
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/icgrep.cpp

    r5031 r5036  
    205205
    206206int main(int argc, char *argv[]) {
    207     cl::HideUnrelatedOptions(ArrayRef<const cl::OptionCategory *>{&LegacyGrepOptions, &EnhancedGrepOptions, re::re_toolchain_flags(), pablo::pablo_toolchain_flags()});
     207    cl::HideUnrelatedOptions(ArrayRef<const cl::OptionCategory *>{&LegacyGrepOptions, &EnhancedGrepOptions, re::re_toolchain_flags(), pablo::pablo_toolchain_flags(), codegen::codegen_flags()});
    208208    cl::ParseCommandLineOptions(argc, argv);
    209209   
  • icGREP/icgrep-devel/icgrep/kernels/u8u16_pipeline.cpp

    r5014 r5036  
    66#include <kernels/u8u16_pipeline.h>
    77#include <utf_encoding.h>
     8#include <toolchain.h>
    89
    910#include <kernels/s2p_kernel.h>
     
    1718#include <pablo/pablo_toolchain.h>
    1819
    19 static cl::opt<unsigned> SegmentSize("segment-size", cl::desc("Segment Size"), cl::value_desc("positive integer"), cl::init(1));
    2020
    2121
     
    4040
    4141void PipelineBuilder::CreateKernels(PabloFunction * function){
    42     mS2PKernel = new KernelBuilder(iBuilder, "s2p", SegmentSize);
    43     mU8U16Kernel = new KernelBuilder(iBuilder, "u8u16", SegmentSize);
    44     mDelKernel = new KernelBuilder(iBuilder, "del", SegmentSize);
    45     mP2SKernel = new KernelBuilder(iBuilder, "p2s", SegmentSize);   
    46     //mStdOutKernel = new KernelBuilder(iBuilder, "stdout", SegmentSize);
     42    mS2PKernel = new KernelBuilder(iBuilder, "s2p", codegen::SegmentSize);
     43    mU8U16Kernel = new KernelBuilder(iBuilder, "u8u16", codegen::SegmentSize);
     44    mDelKernel = new KernelBuilder(iBuilder, "del", codegen::SegmentSize);
     45    mP2SKernel = new KernelBuilder(iBuilder, "p2s", codegen::SegmentSize);   
     46    //mStdOutKernel = new KernelBuilder(iBuilder, "stdout", codegen::SegmentSize);
    4747
    4848    generateS2PKernel(mMod, iBuilder, mS2PKernel);
     
    8787    BasicBlock * segmentCondBlock = nullptr;
    8888    BasicBlock * segmentBodyBlock = nullptr;
    89     const unsigned segmentSize = SegmentSize;
     89    const unsigned segmentSize = codegen::SegmentSize;
    9090    if (segmentSize > 1) {
    9191        segmentCondBlock = BasicBlock::Create(mMod->getContext(), "segmentCond", main, 0);
  • icGREP/icgrep-devel/icgrep/u8u16.cpp

    r5033 r5036  
    11/*
    2  *  Copyright (c) 2015 International Characters.
     2 *  Copyright (c) 2016 International Characters.
    33 *  This software is licensed to the public under the Open Software License 3.0.
    44 *  icgrep is a trademark of International Characters.
     
    2323#include <re/re_cc.h>
    2424#include <cc/cc_compiler.h>
     25#include <pablo/pablo_toolchain.h>
    2526#include <pablo/function.h>
    2627#include <IDISA/idisa_builder.h>
     
    3738
    3839#include <fcntl.h>
    39 
    40 static cl::list<std::string> inputFiles(cl::Positional, cl::desc("<input file ...>"), cl::OneOrMore);
    41 
    42 
     40static cl::OptionCategory u8u16Options("u8u16 Options",
     41                                            "Transcoding control options.");
     42
     43static cl::list<std::string> inputFiles(cl::Positional, cl::desc("<input file ...>"), cl::OneOrMore, cl::cat(u8u16Options));
    4344
    4445//
     
    283284
    284285int main(int argc, char *argv[]) {
     286    cl::HideUnrelatedOptions(ArrayRef<const cl::OptionCategory *>{&u8u16Options, pablo::pablo_toolchain_flags(), codegen::codegen_flags()});
    285287    cl::ParseCommandLineOptions(argc, argv);
    286288
  • icGREP/icgrep-devel/icgrep/wc.cpp

    r5035 r5036  
    1313
    1414#include <toolchain.h>
     15#include <pablo/pablo_toolchain.h>
    1516#include <llvm/IR/Function.h>
    1617#include <llvm/IR/Module.h>
     
    380381
    381382int main(int argc, char *argv[]) {
    382     HideUnrelatedOptions(wcFlags);
    383 
     383    cl::HideUnrelatedOptions(ArrayRef<const cl::OptionCategory *>{&wcFlags, pablo::pablo_toolchain_flags(), codegen::codegen_flags()});
    384384    cl::ParseCommandLineOptions(argc, argv);
    385385    if (wcOptions.size() == 0) {
Note: See TracChangeset for help on using the changeset viewer.