diff --git a/llpc/test/shaderdb/gfx9/ExtShaderBallot_TestArithmeticData16AMD.frag b/llpc/test/shaderdb/extensions/ExtShaderBallot_TestArithmeticData16AMD.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderBallot_TestArithmeticData16AMD.frag rename to llpc/test/shaderdb/extensions/ExtShaderBallot_TestArithmeticData16AMD.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16Fetch_TestFetchData16.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16Fetch_TestFetchData16.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16Fetch_TestFetchData16.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16Fetch_TestFetchData16.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16Fetch_TestGatherData16.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16Fetch_TestGatherData16.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16Fetch_TestGatherData16.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16Fetch_TestGatherData16.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16Fetch_TestImagingData16.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16Fetch_TestImagingData16.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16Fetch_TestImagingData16.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16Fetch_TestImagingData16.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16Fetch_TestSamplingData16.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16Fetch_TestSamplingData16.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16Fetch_TestSamplingData16.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16Fetch_TestSamplingData16.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16Fetch_TestSubpassSamplingData16.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16Fetch_TestSubpassSamplingData16.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16Fetch_TestSubpassSamplingData16.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16Fetch_TestSubpassSamplingData16.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestAngleTrigFuncs_lit.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16_TestAngleTrigFuncs_lit.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestAngleTrigFuncs_lit.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16_TestAngleTrigFuncs_lit.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestArithmeticOp_lit.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16_TestArithmeticOp_lit.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestArithmeticOp_lit.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16_TestArithmeticOp_lit.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestCommonFuncs_lit.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16_TestCommonFuncs_lit.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestCommonFuncs_lit.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16_TestCommonFuncs_lit.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestDerivFuncs_lit.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16_TestDerivFuncs_lit.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestDerivFuncs_lit.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16_TestDerivFuncs_lit.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestExponentialFuncs_lit.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16_TestExponentialFuncs_lit.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestExponentialFuncs_lit.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16_TestExponentialFuncs_lit.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestGeometryFuncs_lit.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16_TestGeometryFuncs_lit.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestGeometryFuncs_lit.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16_TestGeometryFuncs_lit.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestInterpFuncs_lit.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16_TestInterpFuncs_lit.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestInterpFuncs_lit.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16_TestInterpFuncs_lit.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestMatrixFuncs_lit.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16_TestMatrixFuncs_lit.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestMatrixFuncs_lit.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16_TestMatrixFuncs_lit.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestPackUnpackFuncs_lit.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16_TestPackUnpackFuncs_lit.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestPackUnpackFuncs_lit.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16_TestPackUnpackFuncs_lit.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestRelationalFuncs_lit.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16_TestRelationalFuncs_lit.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestRelationalFuncs_lit.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16_TestRelationalFuncs_lit.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestSpecConst.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16_TestSpecConst.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestSpecConst.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16_TestSpecConst.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestStorageBlock.comp b/llpc/test/shaderdb/extensions/ExtShaderFloat16_TestStorageBlock.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestStorageBlock.comp rename to llpc/test/shaderdb/extensions/ExtShaderFloat16_TestStorageBlock.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestStorageBlockRowMajorMatrix.comp b/llpc/test/shaderdb/extensions/ExtShaderFloat16_TestStorageBlockRowMajorMatrix.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestStorageBlockRowMajorMatrix.comp rename to llpc/test/shaderdb/extensions/ExtShaderFloat16_TestStorageBlockRowMajorMatrix.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestTrinaryMinMaxFuncs.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16_TestTrinaryMinMaxFuncs.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestTrinaryMinMaxFuncs.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16_TestTrinaryMinMaxFuncs.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestVectorMatrixOp.frag b/llpc/test/shaderdb/extensions/ExtShaderFloat16_TestVectorMatrixOp.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderFloat16_TestVectorMatrixOp.frag rename to llpc/test/shaderdb/extensions/ExtShaderFloat16_TestVectorMatrixOp.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBasicArithInt16.frag b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestBasicArithInt16.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBasicArithInt16.frag rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestBasicArithInt16.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBasicArithUint16.frag b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestBasicArithUint16.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBasicArithUint16.frag rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestBasicArithUint16.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBitwiseOp.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestBitwiseOp.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBitwiseOp.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestBitwiseOp.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncAbs.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncAbs.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncAbs.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncAbs.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncBitConv.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncBitConv.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncBitConv.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncBitConv.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncFrexp.frag b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncFrexp.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncFrexp.frag rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncFrexp.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncMinMaxClamp.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncMinMaxClamp.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncMinMaxClamp.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncMinMaxClamp.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncMix.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncMix.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncMix.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncMix.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncPack.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncPack.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncPack.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncPack.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncSign.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncSign.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncSign.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncSign.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncUnpack.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncUnpack.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncUnpack.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncUnpack.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncVectorCmp.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncVectorCmp.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestBuiltInFuncVectorCmp.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestBuiltInFuncVectorCmp.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestNegate.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestNegate.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestNegate.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestNegate.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestScalarCmp.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestScalarCmp.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestScalarCmp.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestScalarCmp.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestShiftOp.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestShiftOp.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestShiftOp.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestShiftOp.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestSpecConst.frag b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestSpecConst.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestSpecConst.frag rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestSpecConst.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestStorageBlockAccess.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestStorageBlockAccess.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestStorageBlockAccess.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestStorageBlockAccess.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestTrinaryMinMaxFuncs.frag b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestTrinaryMinMaxFuncs.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestTrinaryMinMaxFuncs.frag rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestTrinaryMinMaxFuncs.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestTypeConvFromBool.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestTypeConvFromBool.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestTypeConvFromBool.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestTypeConvFromBool.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestTypeConvFromFloat.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestTypeConvFromFloat.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestTypeConvFromFloat.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestTypeConvFromFloat.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestTypeConvFromInt.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestTypeConvFromInt.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestTypeConvFromInt.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestTypeConvFromInt.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestTypeConvToBool.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestTypeConvToBool.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestTypeConvToBool.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestTypeConvToBool.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestTypeConvToFloat.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestTypeConvToFloat.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestTypeConvToFloat.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestTypeConvToFloat.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestTypeConvToInt.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestTypeConvToInt.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestTypeConvToInt.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestTypeConvToInt.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt16_TestUniformBlockAccess.comp b/llpc/test/shaderdb/extensions/ExtShaderInt16_TestUniformBlockAccess.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt16_TestUniformBlockAccess.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt16_TestUniformBlockAccess.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBasicArithInt8.frag b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestBasicArithInt8.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBasicArithInt8.frag rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestBasicArithInt8.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBasicArithUint8.frag b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestBasicArithUint8.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBasicArithUint8.frag rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestBasicArithUint8.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBitwiseOp.comp b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestBitwiseOp.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBitwiseOp.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestBitwiseOp.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBufLoadStore.comp b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestBufLoadStore.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBufLoadStore.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestBufLoadStore.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBuiltInFuncAbs.comp b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestBuiltInFuncAbs.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBuiltInFuncAbs.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestBuiltInFuncAbs.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBuiltInFuncMinMaxClamp.comp b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestBuiltInFuncMinMaxClamp.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBuiltInFuncMinMaxClamp.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestBuiltInFuncMinMaxClamp.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBuiltInFuncSign.comp b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestBuiltInFuncSign.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBuiltInFuncSign.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestBuiltInFuncSign.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBuiltInFuncVectorCmp.comp b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestBuiltInFuncVectorCmp.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestBuiltInFuncVectorCmp.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestBuiltInFuncVectorCmp.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestFsInOut.frag b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestFsInOut.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestFsInOut.frag rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestFsInOut.frag diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestGsInOut.geom b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestGsInOut.geom similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestGsInOut.geom rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestGsInOut.geom diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestNegate.comp b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestNegate.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestNegate.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestNegate.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestScalarCmp.comp b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestScalarCmp.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestScalarCmp.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestScalarCmp.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestSharedVarLoadStore_lit.comp b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestSharedVarLoadStore_lit.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestSharedVarLoadStore_lit.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestSharedVarLoadStore_lit.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestShiftOp_lit.comp b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestShiftOp_lit.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestShiftOp_lit.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestShiftOp_lit.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestSpecConst_lit.comp b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestSpecConst_lit.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestSpecConst_lit.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestSpecConst_lit.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestTcsInOut.tesc b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestTcsInOut.tesc similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestTcsInOut.tesc rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestTcsInOut.tesc diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestTesInOut.tese b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestTesInOut.tese similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestTesInOut.tese rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestTesInOut.tese diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestTypeConvert_lit.comp b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestTypeConvert_lit.comp similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestTypeConvert_lit.comp rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestTypeConvert_lit.comp diff --git a/llpc/test/shaderdb/gfx9/ExtShaderInt8_TestVsInOut_lit.vert b/llpc/test/shaderdb/extensions/ExtShaderInt8_TestVsInOut_lit.vert similarity index 100% rename from llpc/test/shaderdb/gfx9/ExtShaderInt8_TestVsInOut_lit.vert rename to llpc/test/shaderdb/extensions/ExtShaderInt8_TestVsInOut_lit.vert diff --git a/llpc/test/shaderdb/gfx9/ObjFloat16_TestTrinaryMinMaxFuncs_lit.frag b/llpc/test/shaderdb/extensions/ObjFloat16_TestTrinaryMinMaxFuncs_lit.frag similarity index 100% rename from llpc/test/shaderdb/gfx9/ObjFloat16_TestTrinaryMinMaxFuncs_lit.frag rename to llpc/test/shaderdb/extensions/ObjFloat16_TestTrinaryMinMaxFuncs_lit.frag diff --git a/llpc/test/shaderdb/gfx9/PipelineVsFs_TestAlpha2Coverage.pipe b/llpc/test/shaderdb/extensions/PipelineVsFs_TestAlpha2Coverage.pipe similarity index 100% rename from llpc/test/shaderdb/gfx9/PipelineVsFs_TestAlpha2Coverage.pipe rename to llpc/test/shaderdb/extensions/PipelineVsFs_TestAlpha2Coverage.pipe diff --git a/llpc/test/shaderdb/gfx9/PipelineVsFs_TestFetchSingleInput.pipe b/llpc/test/shaderdb/extensions/PipelineVsFs_TestFetchSingleInput.pipe similarity index 92% rename from llpc/test/shaderdb/gfx9/PipelineVsFs_TestFetchSingleInput.pipe rename to llpc/test/shaderdb/extensions/PipelineVsFs_TestFetchSingleInput.pipe index d33887af1c..43262fbbb7 100644 --- a/llpc/test/shaderdb/gfx9/PipelineVsFs_TestFetchSingleInput.pipe +++ b/llpc/test/shaderdb/extensions/PipelineVsFs_TestFetchSingleInput.pipe @@ -11,11 +11,11 @@ ; - there are extra inreg inputs because its determination of how many SGPR inputs ; are conservative; ; - there is no VGPR input for the vertex input that the fetch shader generates. -; SHADERTEST: define amdgpu_vs { i32,{{.*}}, i32, float, float, float, float, <4 x float> } @_amdgpu_vs_main(i32 inreg noundef %0, i32 inreg noundef %1, i32 inreg noundef %VertexBufferTable, i32 inreg noundef %BaseVertex, i32 inreg noundef %BaseInstance, {{.*}}, i32 inreg noundef %{{.*}}, float noundef %VertexId, float noundef %{{.*}}, float noundef %{{.*}}, float noundef %InstanceId) +; SHADERTEST: define amdgpu_vs { i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, float, float, float, float, <4 x float> } @_amdgpu_vs_main(i32 inreg noundef %0, i32 inreg noundef %1, i32 inreg noundef %VertexBufferTable, i32 inreg noundef %BaseVertex, i32 inreg noundef %BaseInstance, i32 inreg noundef %2, i32 inreg noundef %3, i32 inreg noundef %4, i32 inreg noundef %5, i32 inreg noundef %6, i32 inreg noundef %7, i32 inreg noundef %8, i32 inreg noundef %9, i32 inreg noundef %10, i32 inreg noundef %11, float noundef %VertexId, float noundef %12, float noundef %13, float noundef %InstanceId) ; Check that the attribute is loaded. -; SHADERTEST: [[f0:%.*]] = call i32 @llvm.amdgcn.struct.tbuffer.load.i32(<4 x i32> [[addr:%[0-9]*]], i32 %VertexIndex, i32 0, i32 0, i32 immarg 116, i32 immarg 0) -; SHADERTEST: [[f1:%.*]] = call i32 @llvm.amdgcn.struct.tbuffer.load.i32(<4 x i32> [[addr:%[0-9]*]], i32 %VertexIndex, i32 4, i32 0, i32 immarg 116, i32 immarg 0) -; SHADERTEST: [[f2:%.*]] = call i32 @llvm.amdgcn.struct.tbuffer.load.i32(<4 x i32> [[addr:%[0-9]*]], i32 %VertexIndex, i32 8, i32 0, i32 immarg 116, i32 immarg 0) +; SHADERTEST: [[f0:%.*]] = call i32 @llvm.amdgcn.struct.tbuffer.load.i32(<4 x i32> [[addr:%[0-9]*]], i32 %VertexIndex, i32 0, i32 0, i32 immarg 22, i32 immarg 0) +; SHADERTEST: [[f1:%.*]] = call i32 @llvm.amdgcn.struct.tbuffer.load.i32(<4 x i32> [[addr:%[0-9]*]], i32 %VertexIndex, i32 4, i32 0, i32 immarg 22, i32 immarg 0) +; SHADERTEST: [[f2:%.*]] = call i32 @llvm.amdgcn.struct.tbuffer.load.i32(<4 x i32> [[addr:%[0-9]*]], i32 %VertexIndex, i32 8, i32 0, i32 immarg 22, i32 immarg 0) ; SHADERTEST: [[vectmp0:%.*]] = insertelement <4 x i32> , i32 [[f0]], i{{32|64}} 0 ; SHADERTEST: [[vectmp1:%.*]] = insertelement <4 x i32> [[vectmp0]], i32 [[f1]], i{{32|64}} 1 ; SHADERTEST: [[vecf:%.*]] = insertelement <4 x i32> [[vectmp1]], i32 [[f2]], i{{32|64}} 2 @@ -28,11 +28,11 @@ ; BEGIN_SHADERTEST ; Check that the fetch shader loads the inputs into the correct registers. -; RUN: amdllpc -use-relocatable-shader-elf -o %t.elf %gfxip %s && llvm-objdump --triple=amdgcn --mcpu=gfx900 -d %t.elf | FileCheck -check-prefix=SHADERTEST2 %s +; RUN: amdllpc -use-relocatable-shader-elf -o %t.elf %gfxip %s && llvm-objdump --triple=amdgcn --mcpu=gfx1010 -d %t.elf | FileCheck -check-prefix=SHADERTEST2 %s ; SHADERTEST2: Disassembly of section .text: ; SHADERTEST2: 0000000000000000 <_amdgpu_vs_main> ; SHADERTEST2-DAG: v_mov_b32_e32 v7, 1.0 -; SHADERTEST2-DAG: tbuffer_load_format_xyz v[4:6], v{{[0-9]*}}, s[{{[0-9]+}}:{{[0-9]+}}], {{dfmt:13, nfmt:7, 0|0 format:\[BUF_DATA_FORMAT_32_32_32,BUF_NUM_FORMAT_FLOAT\]}} idxen +; SHADERTEST2-DAG: tbuffer_load_format_xyz v[4:6], v{{[0-9]*}}, s[{{[0-9]+}}:{{[0-9]+}}], 0 format:[BUF_FMT_32_32_32_FLOAT] idxen ; Identify the start of the vertex shader ; SHADERTEST2: <_amdgpu_vs_main_fetchless>: ; SHADERTEST2: s_getpc_b64 s[{{[0-9]+}}:{{[0-9]+}}] diff --git a/llpc/test/shaderdb/gfx9/lit.local.cfg b/llpc/test/shaderdb/gfx9/lit.local.cfg deleted file mode 100644 index 839ab8ab55..0000000000 --- a/llpc/test/shaderdb/gfx9/lit.local.cfg +++ /dev/null @@ -1,9 +0,0 @@ - -# overwrite %gfxip in config.substitutions -config.gfxip = '-gfxip=9' - -index = 0; -for substitution in config.substitutions : - if substitution[0] == '%gfxip' : - config.substitutions[index] = ('%gfxip', config.gfxip); - index += 1;