Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to this

The following people from multiple organizations have contributed to this project:

* (Ventana Micro Systems)[https://www.ventanamicro.com]
* (Arup Chakraborty)[https://github.com/arupc]
* [Ventana Micro Systems]([https://www.ventanamicro.com)
* [Arup Chakraborty](https://github.com/arupc)

* (MIPS)[https://mips.com]
* (Knute Lingaard)[https://github.com/klingaard]
* (Kathlene Magnus)[https://github.com/kathlenemagnus]
* [MIPS](https://mips.com)
* [Knute Lingaard](https://github.com/klingaard)
* [Kathlene Magnus](https://github.com/kathlenemagnus)

* (Condor Computing)[https://condorcomputing.com]
* (Jeff Nye)[https://github.com/jeffnye-gh]
* [Condor Computing](https://condorcomputing.com)
* [Jeff Nye](https://github.com/jeffnye-gh)

* (InCore Semiconductors)[https://incoresemi.com/]
* (Sai Govardhan)[https://github.com/govardhnn]
* [InCore Semiconductors](https://incoresemi.com/)
* [Sai Govardhan](https://github.com/govardhnn)

List is incomplete and more contributor names/organizations to be added.
34 changes: 17 additions & 17 deletions arches/isa_json/gen_uarch_rv64v_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -487,37 +487,37 @@
"vid.v" : {"pipe" : "vmask", "uop_gen" : "ELEMENTWISE", "latency" : 1},

# Vector Permutation Instructions: Integer Scalar Move Instructions
"vmv.x.s" : {"pipe" : "v2s", "uop_gen" : "NONE", "latency" : 1},
"vmv.s.x" : {"pipe" : "vmv", "uop_gen" : "NONE", "latency" : 1},
"vmv.x.s" : {"pipe" : "v2s", "uop_gen" : "SCALAR_MOVE", "latency" : 1},
"vmv.s.x" : {"pipe" : "vmv", "uop_gen" : "SCALAR_MOVE", "latency" : 1},

# Vector Permutation Instructions: Floating-Point Scalar Move Instructions
"vfmv.f.s" : {"pipe" : "v2s", "uop_gen" : "NONE", "latency" : 1},
"vfmv.s.f" : {"pipe" : "vmv", "uop_gen" : "NONE", "latency" : 1},
"vfmv.f.s" : {"pipe" : "v2s", "uop_gen" : "SCALAR_MOVE", "latency" : 1},
"vfmv.s.f" : {"pipe" : "vmv", "uop_gen" : "SCALAR_MOVE", "latency" : 1},

# Vector Permutation Instructions: Vector Slide Instructions
"vslideup.vx" : {"pipe" : "vpermute", "uop_gen" : "PERMUTE", "latency" : 6},
"vslideup.vi" : {"pipe" : "vpermute", "uop_gen" : "PERMUTE", "latency" : 6},
"vslidedown.vx" : {"pipe" : "vpermute", "uop_gen" : "PERMUTE", "latency" : 6},
"vslidedown.vi" : {"pipe" : "vpermute", "uop_gen" : "PERMUTE", "latency" : 6},
"vslideup.vx" : {"pipe" : "vpermute", "uop_gen" : "SLIDEUP", "latency" : 6},
"vslideup.vi" : {"pipe" : "vpermute", "uop_gen" : "SLIDEUP", "latency" : 6},
"vslidedown.vx" : {"pipe" : "vpermute", "uop_gen" : "SLIDEDOWN", "latency" : 6},
"vslidedown.vi" : {"pipe" : "vpermute", "uop_gen" : "SLIDEDOWN", "latency" : 6},
"vslide1up.vx" : {"pipe" : "vint", "uop_gen" : "SLIDE1UP", "latency" : 1},
"vfslide1up.vf" : {"pipe" : "vfloat", "uop_gen" : "SLIDE1UP", "latency" : 1},
"vslide1down.vx" : {"pipe" : "vint", "uop_gen" : "SLIDE1DOWN", "latency" : 1},
"vfslide1down.vf": {"pipe" : "vfloat", "uop_gen" : "SLIDE1DOWN", "latency" : 1},

# Vector Permutation Instructions: Vector Register Gather Instructions
"vrgather.vv" : {"pipe" : "vpermute", "uop_gen" : "PERMUTE", "latency" : 6},
"vrgatherei16.vv": {"pipe" : "vpermute", "uop_gen" : "PERMUTE", "latency" : 6},
"vrgather.vx" : {"pipe" : "vpermute", "uop_gen" : "PERMUTE", "latency" : 6},
"vrgather.vi" : {"pipe" : "vpermute", "uop_gen" : "PERMUTE", "latency" : 6},
"vrgather.vv" : {"pipe" : "vpermute", "uop_gen" : "RGATHER", "latency" : 6},
"vrgatherei16.vv": {"pipe" : "vpermute", "uop_gen" : "RGATHER", "latency" : 6},
"vrgather.vx" : {"pipe" : "vpermute", "uop_gen" : "RGATHER", "latency" : 6},
"vrgather.vi" : {"pipe" : "vpermute", "uop_gen" : "RGATHER", "latency" : 6},

# Vector Permutation Instructions: Vector Compress Instruction
"vcompress.vm" : {"pipe" : "vpermute", "uop_gen" : "PERMUTE", "latency" : 6},
"vcompress.vm" : {"pipe" : "vpermute", "uop_gen" : "COMPRESS", "latency" : 6},

# Vector Permutation Instructions: Whole Vector Register Move
"vmv1r.v" : {"pipe" : "vmv", "uop_gen" : "ELEMENTWISE", "latency" : 1},
"vmv2r.v" : {"pipe" : "vmv", "uop_gen" : "ELEMENTWISE", "latency" : 1},
"vmv4r.v" : {"pipe" : "vmv", "uop_gen" : "ELEMENTWISE", "latency" : 1},
"vmv8r.v" : {"pipe" : "vmv", "uop_gen" : "ELEMENTWISE", "latency" : 1},
"vmv1r.v" : {"pipe" : "vmv", "uop_gen" : "WHOLE_REG_MOVE", "latency" : 1},
"vmv2r.v" : {"pipe" : "vmv", "uop_gen" : "WHOLE_REG_MOVE", "latency" : 1},
"vmv4r.v" : {"pipe" : "vmv", "uop_gen" : "WHOLE_REG_MOVE", "latency" : 1},
"vmv8r.v" : {"pipe" : "vmv", "uop_gen" : "WHOLE_REG_MOVE", "latency" : 1},
}

# Get a list of all vector insts from Mavis
Expand Down
52 changes: 26 additions & 26 deletions arches/isa_json/olympia_uarch_rv64v.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@
{
"mnemonic": "vcompress.vm",
"pipe": "vpermute",
"uop_gen": "PERMUTE",
"latency": 4
"uop_gen": "COMPRESS",
"latency": 6
},
{
"mnemonic": "vdiv.vv",
Expand Down Expand Up @@ -302,13 +302,13 @@
{
"mnemonic": "vfmv.f.s",
"pipe": "v2s",
"uop_gen": "NONE",
"uop_gen": "SCALAR_MOVE",
"latency": 1
},
{
"mnemonic": "vfmv.s.f",
"pipe": "vmv",
"uop_gen": "NONE",
"uop_gen": "SCALAR_MOVE",
"latency": 1
},
{
Expand Down Expand Up @@ -1328,7 +1328,7 @@
{
"mnemonic": "vmv.s.x",
"pipe": "vmv",
"uop_gen": "NONE",
"uop_gen": "SCALAR_MOVE",
"latency": 1
},
{
Expand All @@ -1352,31 +1352,31 @@
{
"mnemonic": "vmv.x.s",
"pipe": "v2s",
"uop_gen": "NONE",
"uop_gen": "SCALAR_MOVE",
"latency": 1
},
{
"mnemonic": "vmv1r.v",
"pipe": "vmv",
"uop_gen": "ELEMENTWISE",
"uop_gen": "WHOLE_REG_MOVE",
"latency": 1
},
{
"mnemonic": "vmv2r.v",
"pipe": "vmv",
"uop_gen": "ELEMENTWISE",
"uop_gen": "WHOLE_REG_MOVE",
"latency": 1
},
{
"mnemonic": "vmv4r.v",
"pipe": "vmv",
"uop_gen": "ELEMENTWISE",
"uop_gen": "WHOLE_REG_MOVE",
"latency": 1
},
{
"mnemonic": "vmv8r.v",
"pipe": "vmv",
"uop_gen": "ELEMENTWISE",
"uop_gen": "WHOLE_REG_MOVE",
"latency": 1
},
{
Expand Down Expand Up @@ -1586,26 +1586,26 @@
{
"mnemonic": "vrgather.vi",
"pipe": "vpermute",
"uop_gen": "PERMUTE",
"latency": 4
"uop_gen": "RGATHER",
"latency": 6
},
{
"mnemonic": "vrgather.vv",
"pipe": "vpermute",
"uop_gen": "PERMUTE",
"latency": 4
"uop_gen": "RGATHER",
"latency": 6
},
{
"mnemonic": "vrgather.vx",
"pipe": "vpermute",
"uop_gen": "PERMUTE",
"latency": 4
"uop_gen": "RGATHER",
"latency": 6
},
{
"mnemonic": "vrgatherei16.vv",
"pipe": "vpermute",
"uop_gen": "PERMUTE",
"latency": 4
"uop_gen": "RGATHER",
"latency": 6
},
{
"mnemonic": "vrsub.vi",
Expand Down Expand Up @@ -1766,26 +1766,26 @@
{
"mnemonic": "vslidedown.vi",
"pipe": "vpermute",
"uop_gen": "PERMUTE",
"latency": 4
"uop_gen": "SLIDEDOWN",
"latency": 6
},
{
"mnemonic": "vslidedown.vx",
"pipe": "vpermute",
"uop_gen": "PERMUTE",
"latency": 4
"uop_gen": "SLIDEDOWN",
"latency": 6
},
{
"mnemonic": "vslideup.vi",
"pipe": "vpermute",
"uop_gen": "PERMUTE",
"latency": 4
"uop_gen": "SLIDEUP",
"latency": 6
},
{
"mnemonic": "vslideup.vx",
"pipe": "vpermute",
"uop_gen": "PERMUTE",
"latency": 4
"uop_gen": "SLIDEUP",
"latency": 6
},
{
"mnemonic": "vsll.vi",
Expand Down
10 changes: 8 additions & 2 deletions core/InstArchInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,16 @@ namespace olympia
{"REDUCTION", InstArchInfo::UopGenType::REDUCTION},
{"REDUCTION_WIDE", InstArchInfo::UopGenType::REDUCTION_WIDE},
{"INT_EXT", InstArchInfo::UopGenType::INT_EXT},
{"SLIDEUP", InstArchInfo::UopGenType::SLIDEUP},
{"SLIDEDOWN", InstArchInfo::UopGenType::SLIDEDOWN},
{"SLIDE1UP", InstArchInfo::UopGenType::SLIDE1UP},
{"SLIDE1DOWN", InstArchInfo::UopGenType::SLIDE1DOWN},
{"PERMUTE", InstArchInfo::UopGenType::PERMUTE},
{"NONE", InstArchInfo::UopGenType::NONE}};
{"SCALAR_MOVE", InstArchInfo::UopGenType::SCALAR_MOVE},
{"RGATHER", InstArchInfo::UopGenType::RGATHER},
{"COMPRESS", InstArchInfo::UopGenType::COMPRESS},
{"WHOLE_REG_MOVE", InstArchInfo::UopGenType::WHOLE_REG_MOVE},
{"NONE", InstArchInfo::UopGenType::NONE},
};

void InstArchInfo::update(const nlohmann::json & jobj)
{
Expand Down
7 changes: 6 additions & 1 deletion core/InstArchInfo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,14 @@ namespace olympia
REDUCTION,
REDUCTION_WIDE,
INT_EXT,
SLIDEUP,
SLIDEDOWN,
SLIDE1UP,
SLIDE1DOWN,
PERMUTE,
SCALAR_MOVE,
RGATHER,
COMPRESS,
WHOLE_REG_MOVE,
NONE,
UNKNOWN
};
Expand Down
Loading