Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better C++ compatibility and fixes to conditional branch/switch handling #10

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Better C++ compatibility and fixes to conditional branch/switch handling #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2677273
Add C++ header guard to extension header
mtehver Apr 18, 2022
a2a8534
Fix Phi node handling after executing OpBranchConditional, OpSwitch i…
mtehver Apr 18, 2022
fc2f6ad
A fix for Phi nodes by keeping track of current block immediate parents
mtehver Apr 19, 2022
463d733
Cleanup the code by keeping original OpLabel locations. Handling of b…
mtehver Apr 20, 2022
cb02416
Fixed OpAny and OpAll (previous version only checked first component …
mtehver Apr 21, 2022
1f653d0
Fixes to OpVectorExtractDynamic, OpVectorInsertDynamic, OpCompositeCo…
mtehver Jan 17, 2023
061b21a
Support for OpUndef, additional array bound-checking
mtehver Jan 20, 2023
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
8 changes: 8 additions & 0 deletions inc/spvm/ext/GLSL450.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
#ifndef __SPRIV_VM_EXT_GLSL_450_H__
#define __SPRIV_VM_EXT_GLSL_450_H__

#ifdef __cplusplus
extern "C" {
#endif // __cplusplus

#include <spvm/opcode.h>

spvm_ext_opcode_func* spvm_build_glsl450_ext();

#ifdef __cplusplus
}
#endif // __cplusplus

#endif // __SPRIV_VM_EXT_GLSL_450_H__
1 change: 1 addition & 0 deletions inc/spvm/state.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ typedef struct spvm_state {
spvm_word return_id;
spvm_word* function_stack_returns;
spvm_word* function_stack_cfg;
spvm_word* function_stack_cfg_parent;

void(*emit_vertex)(struct spvm_state*, spvm_word);
void(*end_primitive)(struct spvm_state*, spvm_word);
Expand Down
4 changes: 2 additions & 2 deletions src/ext/GLSL450.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ void spvm_execute_GLSL450_SmoothStep(spvm_word type, spvm_word id, spvm_word wor
double edge1Val = state->results[edge1].members[i].value.d;

if (edge0Val == edge1Val) {
state->results[id].members[i].value.d = 0.0;
state->results[id].members[i].value.d = (xVal < edge0Val ? 0.0 : 1.0);
} else {
xVal = SPVM_CLAMP((xVal - edge0Val) / (edge1Val - edge0Val), 0.0, 1.0);
state->results[id].members[i].value.d = xVal * xVal * (3.0 - 2.0 * xVal);
Expand All @@ -700,7 +700,7 @@ void spvm_execute_GLSL450_SmoothStep(spvm_word type, spvm_word id, spvm_word wor
float edge1Val = state->results[edge1].members[i].value.f;

if (edge0Val == edge1Val) {
state->results[id].members[i].value.f = 0.0f;
state->results[id].members[i].value.f = (xVal < edge0Val ? 0.0f : 1.0f);
} else {
xVal = SPVM_CLAMP((xVal - edge0Val) / (edge1Val - edge0Val), 0.0f, 1.0f);
state->results[id].members[i].value.f = xVal * xVal * (3.0f - 2.0f * xVal);
Expand Down
213 changes: 195 additions & 18 deletions src/opcode_execute.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ void spvm_execute_OpVectorExtractDynamic(spvm_word word_count, spvm_state_t stat

spvm_word index = state->results[index_id].members[0].value.u64;

if (index < 0 || index >= state->results[vector].member_count)
if (!(index < 0 || index >= state->results[vector].member_count))
state->results[id].members[0].value.u64 = state->results[vector].members[index].value.u64;
else if (state->analyzer)
state->analyzer->on_undefined_behavior(state, spvm_undefined_behavior_vector_extract_dynamic);
Expand All @@ -951,7 +951,7 @@ void spvm_execute_OpVectorInsertDynamic(spvm_word word_count, spvm_state_t state

spvm_member_memcpy(state->results[id].members, state->results[vector].members, state->results[id].member_count);

if (index < 0 || index >= state->results[id].member_count)
if (!(index < 0 || index >= state->results[id].member_count))
state->results[id].members[index].value.u64 = state->results[comp].members[0].value.u64;
else if (state->analyzer)
state->analyzer->on_undefined_behavior(state, spvm_undefined_behavior_vector_insert_dynamic);
Expand Down Expand Up @@ -980,13 +980,31 @@ void spvm_execute_OpCompositeConstruct(spvm_word word_count, spvm_state_t state)
SPVM_SKIP_WORD(state->code_current);
spvm_word id = SPVM_READ_WORD(state->code_current);

for (spvm_word i = 0; i < state->results[id].member_count; i++) {
spvm_word index_count = word_count - 2;
spvm_member_t result = state->results[id].members;

while (index_count) {
spvm_word index = SPVM_READ_WORD(state->code_current);
if (state->results[id].members[i].member_count == 0)
state->results[id].members[i].value.s = state->results[index].members[0].value.s;
else
spvm_member_memcpy(&state->results[id].members[i].members[0], &state->results[index].members[0], state->results[index].member_count);

if (state->results[id].type == spvm_value_type_vector && state->results[index].type == spvm_value_type_vector) { // special case, append vectors
for (spvm_word j = 0; j < state->results[index].member_count; j++) {
result->value.u64 = state->results[index].members[j].value.u64;

result++;
}
} else {
if (result->member_count == 0)
result->value.u64 = state->results[index].members[0].value.u64;
else
spvm_member_memcpy(&result->members[0], &state->results[index].members[0], state->results[index].member_count);

result++;
}

index_count--;
}

assert(result == state->results[id].members + state->results[id].member_count);
}
void spvm_execute_OpCompositeExtract(spvm_word word_count, spvm_state_t state)
{
Expand Down Expand Up @@ -1015,6 +1033,30 @@ void spvm_execute_OpCompositeExtract(spvm_word word_count, spvm_state_t state)

spvm_member_memcpy(state->results[id].members, result, memcount);
}
void spvm_execute_OpCompositeInsert(spvm_word word_count, spvm_state_t state)
{
SPVM_SKIP_WORD(state->code_current);
spvm_word id = SPVM_READ_WORD(state->code_current);
spvm_word object_id = SPVM_READ_WORD(state->code_current);
spvm_word value_id = SPVM_READ_WORD(state->code_current);

spvm_word index_count = word_count - 5;

spvm_member_memcpy(state->results[id].members, state->results[value_id].members, state->results[value_id].member_count);

spvm_word index = SPVM_READ_WORD(state->code_current);
spvm_member_t result = state->results[id].members + index;

while (index_count) {
index = SPVM_READ_WORD(state->code_current);

result = result->members + index;

index_count--;
}

spvm_member_memcpy(result, state->results[object_id].members, state->results[object_id].member_count);
}
void spvm_execute_OpCopyObject(spvm_word word_count, spvm_state_t state)
{
SPVM_SKIP_WORD(state->code_current);
Expand Down Expand Up @@ -1516,7 +1558,7 @@ void spvm_execute_OpAny(spvm_word word_count, spvm_state_t state)
spvm_word vec = SPVM_READ_WORD(state->code_current);

spvm_byte result = 0;
for (spvm_word i = 0; i < state->results[id].member_count; i++)
for (spvm_word i = 0; i < state->results[vec].member_count; i++)
if (state->results[vec].members[i].value.b)
result = 1;
state->results[id].members[0].value.b = result;
Expand All @@ -1528,7 +1570,7 @@ void spvm_execute_OpAll(spvm_word word_count, spvm_state_t state)
spvm_word vec = SPVM_READ_WORD(state->code_current);

spvm_byte result = 1;
for (spvm_word i = 0; i < state->results[id].member_count; i++)
for (spvm_word i = 0; i < state->results[vec].member_count; i++)
if (!state->results[vec].members[i].value.b)
result = 0;
state->results[id].members[0].value.b = result;
Expand Down Expand Up @@ -1813,6 +1855,138 @@ void spvm_execute_OpFOrdGreaterThanEqual(spvm_word word_count, spvm_state_t stat
for (spvm_word i = 0; i < state->results[id].member_count; i++)
state->results[id].members[i].value.b = state->results[op1].members[i].value.f >= state->results[op2].members[i].value.f;
}
void spvm_execute_OpFUnordEqual(spvm_word word_count, spvm_state_t state)
{
spvm_word type = SPVM_READ_WORD(state->code_current);
spvm_word id = SPVM_READ_WORD(state->code_current);
spvm_word op1 = SPVM_READ_WORD(state->code_current);
spvm_word op2 = SPVM_READ_WORD(state->code_current);

spvm_result_t type_info = spvm_state_get_type_info(state->results, &state->results[type]);

if (type_info->value_bitcount > 32)
for (spvm_word i = 0; i < state->results[id].member_count; i++) {
double d1 = state->results[op1].members[i].value.d;
double d2 = state->results[op2].members[i].value.d;
state->results[id].members[i].value.b = (d1 == d2 || d1 != d1 || d2 != d2);
}
else
for (spvm_word i = 0; i < state->results[id].member_count; i++) {
float f1 = state->results[op1].members[i].value.f;
float f2 = state->results[op2].members[i].value.f;
state->results[id].members[i].value.b = (f1 == f2 || f1 != f1 || f2 != f2);
}
}
void spvm_execute_OpFUnordNotEqual(spvm_word word_count, spvm_state_t state)
{
spvm_word type = SPVM_READ_WORD(state->code_current);
spvm_word id = SPVM_READ_WORD(state->code_current);
spvm_word op1 = SPVM_READ_WORD(state->code_current);
spvm_word op2 = SPVM_READ_WORD(state->code_current);

spvm_result_t type_info = spvm_state_get_type_info(state->results, &state->results[type]);

if (type_info->value_bitcount > 32)
for (spvm_word i = 0; i < state->results[id].member_count; i++) {
double d1 = state->results[op1].members[i].value.d;
double d2 = state->results[op2].members[i].value.d;
state->results[id].members[i].value.b = (d1 != d2 || d1 != d1 || d2 != d2);
}
else
for (spvm_word i = 0; i < state->results[id].member_count; i++) {
float f1 = state->results[op1].members[i].value.f;
float f2 = state->results[op2].members[i].value.f;
state->results[id].members[i].value.b = (f1 != f2 || f1 != f1 || f2 != f2);
}
}
void spvm_execute_OpFUnordLessThan(spvm_word word_count, spvm_state_t state)
{
spvm_word type = SPVM_READ_WORD(state->code_current);
spvm_word id = SPVM_READ_WORD(state->code_current);
spvm_word op1 = SPVM_READ_WORD(state->code_current);
spvm_word op2 = SPVM_READ_WORD(state->code_current);

spvm_result_t type_info = spvm_state_get_type_info(state->results, &state->results[type]);

if (type_info->value_bitcount > 32)
for (spvm_word i = 0; i < state->results[id].member_count; i++) {
double d1 = state->results[op1].members[i].value.d;
double d2 = state->results[op2].members[i].value.d;
state->results[id].members[i].value.b = (d1 < d2 || d1 != d1 || d2 != d2);
}
else
for (spvm_word i = 0; i < state->results[id].member_count; i++) {
float f1 = state->results[op1].members[i].value.f;
float f2 = state->results[op2].members[i].value.f;
state->results[id].members[i].value.b = (f1 < f2 || f1 != f1 || f2 != f2);
}
}
void spvm_execute_OpFUnordGreaterThan(spvm_word word_count, spvm_state_t state)
{
spvm_word type = SPVM_READ_WORD(state->code_current);
spvm_word id = SPVM_READ_WORD(state->code_current);
spvm_word op1 = SPVM_READ_WORD(state->code_current);
spvm_word op2 = SPVM_READ_WORD(state->code_current);

spvm_result_t type_info = spvm_state_get_type_info(state->results, &state->results[type]);

if (type_info->value_bitcount > 32)
for (spvm_word i = 0; i < state->results[id].member_count; i++) {
double d1 = state->results[op1].members[i].value.d;
double d2 = state->results[op2].members[i].value.d;
state->results[id].members[i].value.b = (d1 > d2 || d1 != d1 || d2 != d2);
}
else
for (spvm_word i = 0; i < state->results[id].member_count; i++) {
float f1 = state->results[op1].members[i].value.f;
float f2 = state->results[op2].members[i].value.f;
state->results[id].members[i].value.b = (f1 > f2 || f1 != f1 || f2 != f2);
}
}
void spvm_execute_OpFUnordLessThanEqual(spvm_word word_count, spvm_state_t state)
{
spvm_word type = SPVM_READ_WORD(state->code_current);
spvm_word id = SPVM_READ_WORD(state->code_current);
spvm_word op1 = SPVM_READ_WORD(state->code_current);
spvm_word op2 = SPVM_READ_WORD(state->code_current);

spvm_result_t type_info = spvm_state_get_type_info(state->results, &state->results[type]);

if (type_info->value_bitcount > 32)
for (spvm_word i = 0; i < state->results[id].member_count; i++) {
double d1 = state->results[op1].members[i].value.d;
double d2 = state->results[op2].members[i].value.d;
state->results[id].members[i].value.b = (d1 <= d2 || d1 != d1 || d2 != d2);
}
else
for (spvm_word i = 0; i < state->results[id].member_count; i++) {
float f1 = state->results[op1].members[i].value.f;
float f2 = state->results[op2].members[i].value.f;
state->results[id].members[i].value.b = (f1 <= f2 || f1 != f1 || f2 != f2);
}
}
void spvm_execute_OpFUnordGreaterThanEqual(spvm_word word_count, spvm_state_t state)
{
spvm_word type = SPVM_READ_WORD(state->code_current);
spvm_word id = SPVM_READ_WORD(state->code_current);
spvm_word op1 = SPVM_READ_WORD(state->code_current);
spvm_word op2 = SPVM_READ_WORD(state->code_current);

spvm_result_t type_info = spvm_state_get_type_info(state->results, &state->results[type]);

if (type_info->value_bitcount > 32)
for (spvm_word i = 0; i < state->results[id].member_count; i++) {
double d1 = state->results[op1].members[i].value.d;
double d2 = state->results[op2].members[i].value.d;
state->results[id].members[i].value.b = (d1 >= d2 || d1 != d1 || d2 != d2);
}
else
for (spvm_word i = 0; i < state->results[id].member_count; i++) {
float f1 = state->results[op1].members[i].value.f;
float f2 = state->results[op2].members[i].value.f;
state->results[id].members[i].value.b = (f1 >= f2 || f1 != f1 || f2 != f2);
}
}

/* 3.32.16 Derivative Instructions */
void spvm_execute_OpDPdx(spvm_word word_count, spvm_state_t state)
Expand Down Expand Up @@ -1900,26 +2074,29 @@ void spvm_execute_OpPhi(spvm_word word_count, spvm_state_t state)

word_count = (word_count - 2) / 2;

int found = 0;
for (spvm_word i = 0; i < word_count; i++) {
spvm_word variable = SPVM_READ_WORD(state->code_current);
spvm_word parent = SPVM_READ_WORD(state->code_current);

if (parent == state->function_stack_cfg[state->function_stack_current]) {
if (parent == state->function_stack_cfg_parent[state->function_stack_current]) {
spvm_member_memcpy(state->results[id].members, state->results[variable].members, state->results[id].member_count);
found = 1;
break;
}
}
assert(found);
}
void spvm_execute_OpLabel(spvm_word word_count, spvm_state_t state)
{
spvm_word id = SPVM_READ_WORD(state->code_current);
state->function_stack_cfg_parent[state->function_stack_current] = state->function_stack_cfg[state->function_stack_current];
state->function_stack_cfg[state->function_stack_current] = id;
}
void spvm_execute_OpBranch(spvm_word word_count, spvm_state_t state)
{
spvm_word id = SPVM_READ_WORD(state->code_current);
state->code_current = state->results[id].source_location;
state->function_stack_cfg[state->function_stack_current] = id;

state->did_jump = 1;
}
Expand Down Expand Up @@ -2123,7 +2300,7 @@ void _spvm_context_create_execute_table(spvm_context_t ctx)
ctx->opcode_execute[SpvOpVectorShuffle] = spvm_execute_OpVectorShuffle;
ctx->opcode_execute[SpvOpCompositeConstruct] = spvm_execute_OpCompositeConstruct;
ctx->opcode_execute[SpvOpCompositeExtract] = spvm_execute_OpCompositeExtract;
ctx->opcode_execute[SpvOpCompositeInsert] = NULL;
ctx->opcode_execute[SpvOpCompositeInsert] = spvm_execute_OpCompositeInsert;
ctx->opcode_execute[SpvOpCopyObject] = spvm_execute_OpCopyObject;
ctx->opcode_execute[SpvOpTranspose] = spvm_execute_OpTranspose;
ctx->opcode_execute[SpvOpCopyLogical] = NULL;
Expand Down Expand Up @@ -2195,12 +2372,12 @@ void _spvm_context_create_execute_table(spvm_context_t ctx)
ctx->opcode_execute[SpvOpFOrdGreaterThan] = spvm_execute_OpFOrdGreaterThan;
ctx->opcode_execute[SpvOpFOrdLessThanEqual] = spvm_execute_OpFOrdLessThanEqual;
ctx->opcode_execute[SpvOpFOrdGreaterThanEqual] = spvm_execute_OpFOrdGreaterThanEqual;
ctx->opcode_execute[SpvOpFUnordEqual] = NULL;
ctx->opcode_execute[SpvOpFUnordNotEqual] = NULL;
ctx->opcode_execute[SpvOpFUnordLessThan] = NULL;
ctx->opcode_execute[SpvOpFUnordGreaterThan] = NULL;
ctx->opcode_execute[SpvOpFUnordLessThanEqual] = NULL;
ctx->opcode_execute[SpvOpFUnordGreaterThanEqual] = NULL;
ctx->opcode_execute[SpvOpFUnordEqual] = spvm_execute_OpFUnordEqual;
ctx->opcode_execute[SpvOpFUnordNotEqual] = spvm_execute_OpFUnordNotEqual;
ctx->opcode_execute[SpvOpFUnordLessThan] = spvm_execute_OpFUnordLessThan;
ctx->opcode_execute[SpvOpFUnordGreaterThan] = spvm_execute_OpFUnordGreaterThan;
ctx->opcode_execute[SpvOpFUnordLessThanEqual] = spvm_execute_OpFUnordLessThanEqual;
ctx->opcode_execute[SpvOpFUnordGreaterThanEqual] = spvm_execute_OpFUnordGreaterThanEqual;

ctx->opcode_execute[SpvOpSampledImage] = spvm_execute_OpSampledImage;
ctx->opcode_execute[SpvOpImageSampleImplicitLod] = spvm_execute_OpImageSample;
Expand Down
3 changes: 2 additions & 1 deletion src/opcode_setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ void spvm_setup_OpLabel(spvm_word word_count, spvm_state_t state)
spvm_word id = SPVM_READ_WORD(state->code_current);

state->results[id].type = spvm_result_type_label;
state->results[id].source_location = state->code_current;
state->results[id].source_location = state->code_current - 2; // store original label location (instruction has length 2)
}


Expand All @@ -472,6 +472,7 @@ void _spvm_context_create_setup_table(spvm_context_t ctx)
{
ctx->opcode_setup = (spvm_opcode_func*)calloc(SPVM_OPCODE_TABLE_LENGTH, sizeof(spvm_opcode_func));

ctx->opcode_setup[SpvOpUndef] = spvm_setup_constant;
ctx->opcode_setup[SpvOpSource] = spvm_setup_OpSource;
ctx->opcode_setup[SpvOpSourceExtension] = spvm_setup_OpSourceExtension;
ctx->opcode_setup[SpvOpName] = spvm_setup_OpName;
Expand Down
Loading