KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pan/midgard: Generalize IS_ALU and quadword_size 

There are more ALU tags, let's do some cleanup while we're at it.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Alyssa Rosenzweig 2019-12-31 21:39:23 -05:00
parent 66f98ffab0
commit db879b034a
8 changed files with 53 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/panfrost/midgard/compiler.h
View File

@ -27,6 +27,7 @@
#include "midgard.h"
#include "helpers.h"
#include "midgard_compile.h"
#include "midgard_ops.h"
#include "lcra.h"
#include "util/hash_table.h"
@ -462,7 +463,7 @@ mir_exit_block(struct compiler_context *ctx)
static inline bool
mir_is_alu_bundle(midgard_bundle *bundle)
{
return IS_ALU(bundle->tag);
return midgard_word_types[bundle->tag] == midgard_word_type_alu;
}
/* Registers/SSA are distinguish in the backend by the bottom-most bit */

1
src/panfrost/midgard/disassemble.c
View File

@ -32,7 +32,6 @@
#include <ctype.h>
#include <string.h>
#include "midgard.h"
#include "midgard-parse.h"
#include "midgard_ops.h"
#include "midgard_quirks.h"
#include "disassemble.h"

23
src/panfrost/midgard/helpers.h
View File

@ -136,28 +136,7 @@
#define TAG_ALU_12 0xA
#define TAG_ALU_16 0xB
static inline int
quadword_size(int tag)
{
switch (tag) {
case TAG_ALU_4:
case TAG_LOAD_STORE_4:
case TAG_TEXTURE_4:
case TAG_TEXTURE_4_VTX:
return 1;
case TAG_ALU_8:
return 2;
case TAG_ALU_12:
return 3;
case TAG_ALU_16:
return 4;
default:
unreachable("Unknown tag");
}
}
#define IS_ALU(tag) (tag == TAG_ALU_4 || tag == TAG_ALU_8 || \
tag == TAG_ALU_12 || tag == TAG_ALU_16)
#define IS_ALU(tag) (tag >= TAG_ALU_4)
/* Special register aliases */

70
src/panfrost/midgard/midgard-parse.h
View File

@ -1,70 +0,0 @@
/* Author(s):
* Connor Abbott
* Alyssa Rosenzweig
*
* Copyright (c) 2013 Connor Abbott (connor@abbott.cx)
* Copyright (c) 2018 Alyssa Rosenzweig (alyssa@rosenzweig.io)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef __midgard_parse_h__
#define __midgard_parse_h__
/* Additional metadata for parsing Midgard binaries, not needed for compilation */
static midgard_word_type midgard_word_types[16] = {
midgard_word_type_unknown, /* 0x0 */
midgard_word_type_unknown, /* 0x1 */
midgard_word_type_texture, /* 0x2 */
midgard_word_type_texture, /* 0x3 */
midgard_word_type_unknown, /* 0x4 */
midgard_word_type_load_store, /* 0x5 */
midgard_word_type_unknown, /* 0x6 */
midgard_word_type_unknown, /* 0x7 */
midgard_word_type_alu, /* 0x8 */
midgard_word_type_alu, /* 0x9 */
midgard_word_type_alu, /* 0xA */
midgard_word_type_alu, /* 0xB */
midgard_word_type_alu, /* 0xC */
midgard_word_type_alu, /* 0xD */
midgard_word_type_alu, /* 0xE */
midgard_word_type_alu, /* 0xF */
};
static unsigned midgard_word_size[16] = {
0, /* 0x0 */
0, /* 0x1 */
1, /* 0x2 */
1, /* 0x3 */
0, /* 0x4 */
1, /* 0x5 */
0, /* 0x6 */
0, /* 0x7 */
1, /* 0x8 */
2, /* 0x9 */
3, /* 0xA */
4, /* 0xB */
1, /* 0xC */
2, /* 0xD */
3, /* 0xE */
4, /* 0xF */
};
#endif

41
src/panfrost/midgard/midgard_ops.c
View File

@ -252,3 +252,44 @@ struct mir_ldst_op_props load_store_opcode_props[256] = {
#undef M16
#undef M32
#undef M64
midgard_word_type midgard_word_types[16] = {
midgard_word_type_unknown, /* 0x0 */
midgard_word_type_unknown, /* 0x1 */
midgard_word_type_texture, /* 0x2 */
midgard_word_type_texture, /* 0x3 */
midgard_word_type_unknown, /* 0x4 */
midgard_word_type_load_store, /* 0x5 */
midgard_word_type_unknown, /* 0x6 */
midgard_word_type_unknown, /* 0x7 */
midgard_word_type_alu, /* 0x8 */
midgard_word_type_alu, /* 0x9 */
midgard_word_type_alu, /* 0xA */
midgard_word_type_alu, /* 0xB */
midgard_word_type_alu, /* 0xC */
midgard_word_type_alu, /* 0xD */
midgard_word_type_alu, /* 0xE */
midgard_word_type_alu, /* 0xF */
};
unsigned midgard_word_size[16] = {
0, /* 0x0 */
0, /* 0x1 */
1, /* 0x2 */
1, /* 0x3 */
0, /* 0x4 */
1, /* 0x5 */
0, /* 0x6 */
0, /* 0x7 */
1, /* 0x8 */
2, /* 0x9 */
3, /* 0xA */
4, /* 0xB */
1, /* 0xC */
2, /* 0xD */
3, /* 0xE */
4, /* 0xF */
};

7
src/panfrost/midgard/midgard_ops.h
View File

@ -19,12 +19,17 @@
* THE SOFTWARE.
*/
#ifndef __MIDGARD_OPS
#define __MIDGARD_OPS
#include "helpers.h"
/* Forward declare */
extern struct mir_op_props alu_opcode_props[256];
extern struct mir_ldst_op_props load_store_opcode_props[256];
extern midgard_word_type midgard_word_types[16];
extern unsigned midgard_word_size[16];
#define OP_IS_STORE(op) (load_store_opcode_props[op].props & LDST_STORE)
@ -72,4 +77,4 @@ effective_writemask(midgard_vector_alu *alu, unsigned existing_mask)
return existing_mask;
};
#endif

2
src/panfrost/midgard/midgard_schedule.c
View File

@ -1101,7 +1101,7 @@ schedule_block(compiler_context *ctx, midgard_block *block)
if (bundle.has_blend_constant)
blend_offset = block->quadword_count;
block->quadword_count += quadword_size(bundle.tag);
block->quadword_count += midgard_word_size[bundle.tag];
}
/* We emitted bundles backwards; copy into the block in reverse-order */

4
src/panfrost/midgard/mir.c
View File

@ -574,7 +574,7 @@ mir_insert_instruction_before_scheduled(
memcpy(bundles + before, &new, sizeof(new));
list_addtail(&new.instructions[0]->link, &before_bundle->instructions[0]->link);
block->quadword_count += quadword_size(new.tag);
block->quadword_count += midgard_word_size[new.tag];
}
void
@ -599,7 +599,7 @@ mir_insert_instruction_after_scheduled(
midgard_bundle new = mir_bundle_for_op(ctx, ins);
memcpy(bundles + after + 1, &new, sizeof(new));
list_add(&new.instructions[0]->link, &after_bundle->instructions[after_bundle->instruction_count - 1]->link);
block->quadword_count += quadword_size(new.tag);
block->quadword_count += midgard_word_size[new.tag];
}
/* Flip the first-two arguments of a (binary) op. Currently ALU