diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2012-09-01 17:26:24 +0200 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2012-09-07 19:03:40 +0200 |
| commit | 3433471e8b46dd9dd042a00f88ef9ad011a94aac (patch) | |
| tree | c0ec40fa2224d8aeb0103516889c77216b4c8a51 /src/gallium/drivers/nv50 | |
| parent | 8a497e5955053293959614fcde76ab4908929215 (diff) | |
nvc0/ir: add initial code to support GK110 ISA encoding
Diffstat (limited to 'src/gallium/drivers/nv50')
4 files changed, 32 insertions, 0 deletions
diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_driver.h b/src/gallium/drivers/nv50/codegen/nv50_ir_driver.h index 9632986fe4..446befa5fb 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_driver.h +++ b/src/gallium/drivers/nv50/codegen/nv50_ir_driver.h @@ -93,6 +93,11 @@ struct nv50_ir_prog_symbol uint32_t offset; }; +#define NVISA_GF100_CHIPSET_C0 0xc0 +#define NVISA_GF100_CHIPSET_D0 0xd0 +#define NVISA_GK104_CHIPSET 0xe0 +#define NVISA_GK110_CHIPSET 0xf0 + struct nv50_ir_prog_info { uint16_t target; /* chipset (0x50, 0x84, 0xc0, ...) */ diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_inlines.h b/src/gallium/drivers/nv50/codegen/nv50_ir_inlines.h index ab4c98fbcd..55a3332c72 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_inlines.h +++ b/src/gallium/drivers/nv50/codegen/nv50_ir_inlines.h @@ -73,6 +73,31 @@ static inline unsigned int typeSizeof(DataType ty) } } +static inline unsigned int typeSizeofLog2(DataType ty) +{ + switch (ty) { + case TYPE_F16: + case TYPE_U16: + case TYPE_S16: + return 1; + case TYPE_F32: + case TYPE_U32: + case TYPE_S32: + return 2; + case TYPE_F64: + case TYPE_U64: + case TYPE_S64: + return 3; + case TYPE_B96: + case TYPE_B128: + return 4; + case TYPE_U8: + case TYPE_S8: + default: + return 0; + } +} + static inline DataType typeOfSize(unsigned int size, bool flt = false, bool sgn = false) { diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp index 726331e91e..1399876771 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp +++ b/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp @@ -1907,6 +1907,7 @@ RegAlloc::InsertConstraintsPass::visit(BasicBlock *bb) texConstraintNVC0(tex); break; case 0xe0: + case NVISA_GK110_CHIPSET: texConstraintNVE0(tex); break; default: diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_target.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_target.cpp index f718912fb3..707c9e8d21 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_target.cpp +++ b/src/gallium/drivers/nv50/codegen/nv50_ir_target.cpp @@ -121,6 +121,7 @@ Target *Target::create(unsigned int chipset) case 0xc0: case 0xd0: case 0xe0: + case NVISA_GK110_CHIPSET: return getTargetNVC0(chipset); case 0x50: case 0x80: |